diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-06-14 01:03:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-06-14 01:03:22 +0000 |
| commit | 25e7ba6dc84805e96d73967f3182ffcb54d4022f (patch) | |
| tree | 87bd8083933f1666e158fa3b9137783d21c8e3da /git-merge.html | |
| parent | b95b43d92df1ebc0d5235b3e84ba4136052b09a2 (diff) | |
| download | git-htmldocs-25e7ba6dc84805e96d73967f3182ffcb54d4022f.tar.gz | |
Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.html b/git-merge.html index 60faaa92a..fced951ac 100644 --- a/git-merge.html +++ b/git-merge.html @@ -632,7 +632,7 @@ merge.tool Controls which merge resolution program is used by
<a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3",
"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
- "diffuse", "ecmerge", "tortoisemerge", and
+ "diffuse", "ecmerge", "tortoisemerge", "araxis", and
"opendiff". Any other value is treated is custom merge tool
and there must be a corresponding mergetool.<tool>.cmd option.
</p>
@@ -922,7 +922,7 @@ Look at the originals. <em>git show :1:filename</em> shows the </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-05-26 08:38:35 UTC
+Last updated 2009-06-14 01:03:00 UTC
</div>
</div>
</body>
|