From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Sep 2011 04:52:18 +0000 (-0700)
Subject: Merge branch 'jn/doc-dashdash' into maint
X-Git-Tag: v1.7.6.3~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7baf32a829e6e253f8b3b683da470be36b54c377;p=git.git

Merge branch 'jn/doc-dashdash' into maint

* jn/doc-dashdash:
  Documentation/i18n: quote double-dash for AsciiDoc
  Documentation: quote double-dash for AsciiDoc

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

7baf32a829e6e253f8b3b683da470be36b54c377
diff --cc Documentation/git-mergetool--lib.txt
index 8c5be6775,5b0d51f7f..f98a41b87
--- a/Documentation/git-mergetool--lib.txt
+++ b/Documentation/git-mergetool--lib.txt
@@@ -7,8 -7,7 +7,8 @@@ git-mergetool--lib - Common git merge t
  
  SYNOPSIS
  --------
 +[verse]
- 'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"'
+ 'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
  
  DESCRIPTION
  -----------