Merge branch 'jn/doc-dashdash' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 04:52:18 +0000 (21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 04:52:18 +0000 (21:52 -0700)
* jn/doc-dashdash:
  Documentation/i18n: quote double-dash for AsciiDoc
  Documentation: quote double-dash for AsciiDoc

Conflicts:
Documentation/git-mergetool--lib.txt

1  2 
Documentation/config.txt
Documentation/git-mergetool--lib.txt
Documentation/git-revert.txt
Documentation/git-sh-i18n.txt
Documentation/git-submodule.txt
Documentation/git-web--browse.txt
Documentation/rev-list-options.txt

Simple merge
@@@ -7,8 -7,7 +7,8 @@@ git-mergetool--lib - Common git merge t
  
  SYNOPSIS
  --------
- 'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"'
 +[verse]
+ 'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
  
  DESCRIPTION
  -----------
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge