diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-05 21:13:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-05 21:13:21 -0800 |
| commit | 076ffcc834f02a4f11d7f4fe8825be3b065020ff (patch) | |
| tree | 6f5fa28df80c60c9b0a1dfab028d3db33ae22fa0 /git-mergetool--lib.txt | |
| parent | 3f2ed6f9b744f05cf2ad32b0c0c80aa149d9fdcb (diff) | |
| download | git-htmldocs-076ffcc834f02a4f11d7f4fe8825be3b065020ff.tar.gz | |
Autogenerated HTML docs for v1.8.1.2-545-g2f19ad
Diffstat (limited to 'git-mergetool--lib.txt')
| -rw-r--r-- | git-mergetool--lib.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool--lib.txt b/git-mergetool--lib.txt index f98a41b87..055550b2b 100644 --- a/git-mergetool--lib.txt +++ b/git-mergetool--lib.txt @@ -3,7 +3,7 @@ git-mergetool{litdd}lib(1) NAME ---- -git-mergetool--lib - Common git merge tool shell scriptlets +git-mergetool--lib - Common Git merge tool shell scriptlets SYNOPSIS -------- @@ -19,7 +19,7 @@ Porcelain-ish scripts and/or are writing new ones. The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using `.`) by other shell scripts to set up functions for working -with git merge tools. +with Git merge tools. Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE` to define the operation mode for the functions listed below. |