diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 18:41:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 18:41:26 (GMT) |
| commit | 412403eb454156ad5e1eafffc771e529730654aa (patch) | |
| tree | 1bb9b0335344512ba7be00e195ebfcb2d97987cc /Documentation/git-mergetool--lib.txt | |
| parent | 5329c99795e187b36a527baa883efe5c3dc2f98c (diff) | |
| parent | 7791a1d9b9a4f4e15662c7c9c7f5837f461bb987 (diff) | |
| download | git-412403eb454156ad5e1eafffc771e529730654aa.zip git-412403eb454156ad5e1eafffc771e529730654aa.tar.gz git-412403eb454156ad5e1eafffc771e529730654aa.tar.bz2 | |
Merge branch 'mz/doc-synopsis-verse' into maint
* mz/doc-synopsis-verse:
Documentation: use [verse] for SYNOPSIS sections
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
| -rw-r--r-- | Documentation/git-mergetool--lib.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt index 63edede..8c5be67 100644 --- a/Documentation/git-mergetool--lib.txt +++ b/Documentation/git-mergetool--lib.txt @@ -7,6 +7,7 @@ git-mergetool--lib - Common git merge tool shell scriptlets SYNOPSIS -------- +[verse] 'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"' DESCRIPTION |