diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-09-03 21:33:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-09-03 21:33:06 +0000 |
| commit | 2db3e750d172a78dadfb29235ad2a2c3c8d45a24 (patch) | |
| tree | 1f66627398f37b23ec3af2697514d33d25060d96 /git-mergetool--lib.html | |
| parent | d7ae629d13f3242b66070b20f4bb83486948150a (diff) | |
| download | git-htmldocs-2db3e750d172a78dadfb29235ad2a2c3c8d45a24.tar.gz | |
Autogenerated HTML docs for v1.7.2.3-313-gcd15
Diffstat (limited to 'git-mergetool--lib.html')
| -rw-r--r-- | git-mergetool--lib.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html index 68cad9891..3d1940768 100644 --- a/git-mergetool--lib.html +++ b/git-mergetool--lib.html @@ -304,12 +304,12 @@ div.exampleblock-content { /* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
-<title>git-mergetool--lib(1)</title>
+<title>git-mergetool--lib(1)</title>
</head>
<body>
<div id="header">
<h1>
-git-mergetool--lib(1) Manual Page
+git-mergetool--lib(1) Manual Page
</h1>
<h2>NAME</h2>
<div class="sectionbody">
@@ -327,10 +327,10 @@ git-mergetool--lib(1) Manual Page <div class="para"><p>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.</p></div>
-<div class="para"><p>The <em>git-mergetool--lib</em> scriptlet is designed to be sourced (using
+<div class="para"><p>The <em>git-mergetool--lib</em> scriptlet is designed to be sourced (using
<tt>.</tt>) by other shell scripts to set up functions for working
with git merge tools.</p></div>
-<div class="para"><p>Before sourcing <em>git-mergetool--lib</em>, your script must set <tt>TOOL_MODE</tt>
+<div class="para"><p>Before sourcing <em>git-mergetool--lib</em>, your script must set <tt>TOOL_MODE</tt>
to define the operation mode for the functions listed below.
<em>diff</em> and <em>merge</em> are valid values.</p></div>
</div>
@@ -388,7 +388,7 @@ run_merge_tool </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-07-21 21:55:29 UTC
+Last updated 2010-09-03 21:30:23 UTC
</div>
</div>
</body>
|