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.html | |
| 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.html')
| -rw-r--r-- | git-mergetool--lib.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html index 65279dbe9..b86cc4b07 100644 --- a/git-mergetool--lib.html +++ b/git-mergetool--lib.html @@ -737,7 +737,7 @@ git-mergetool--lib(1) Manual Page <h2>NAME</h2>
<div class="sectionbody">
<p>git-mergetool--lib -
- Common git merge tool shell scriptlets
+ Common Git merge tool shell scriptlets
</p>
</div>
</div>
@@ -759,7 +759,7 @@ This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones.</p></div>
<div class="paragraph"><p>The <em>git-mergetool--lib</em> scriptlet is designed to be sourced (using
<code>.</code>) by other shell scripts to set up functions for working
-with git merge tools.</p></div>
+with Git merge tools.</p></div>
<div class="paragraph"><p>Before sourcing <em>git-mergetool--lib</em>, your script must set <code>TOOL_MODE</code>
to define the operation mode for the functions listed below.
<em>diff</em> and <em>merge</em> are valid values.</p></div>
@@ -817,7 +817,7 @@ run_merge_tool <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PST
+Last updated 2013-02-05 21:07:26 PST
</div>
</div>
</body>
|