merge-octopus: Work around environment issue on Windows

[git.git] / Documentation / git-mergetool--lib.txt

diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt
index 78eb03f0ae864f67faac55f450bf0fd2be3416b3..d8df55362ce653516006b02df2950c325f1176b7 100644 (file)
--- a/Documentation/git-mergetool--lib.txt
+++ b/Documentation/git-mergetool--lib.txt
@@ -1,5 +1,5 @@
-git-mergetool--lib(1)
-=====================
+git-mergetool{litdd}lib(1)
+==========================

 
 NAME
 ----
 
 NAME
 ----


@@ -16,11 +16,11 @@ This is not a command the end user would want to run.  Ever.
 This documentation is meant for people who are studying the
 Porcelain-ish scripts and/or are writing new ones.
 
 This documentation is meant for people who are studying the
 Porcelain-ish scripts and/or are writing new ones.
 

-The 'git-mergetool--lib' scriptlet is designed to be sourced (using
+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.
 
 `.`) by other shell scripts to set up functions for working
 with git merge tools.
 

-Before sourcing 'git-mergetool--lib', your script must set `TOOL_MODE`
+Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE`

 to define the operation mode for the functions listed below.
 'diff' and 'merge' are valid values.
 
 to define the operation mode for the functions listed below.
 'diff' and 'merge' are valid values.