diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-09-13 06:07:28 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-09-13 06:07:28 +0000 |
| commit | 675570cc05eb839545ef80a812fddc2f33793955 (patch) | |
| tree | 25dce9078c309a697a746a0b428bbe06b112613b /git-merge.html | |
| parent | c6340ff77b7ca871b8d51048ae16c5266757493a (diff) | |
| download | git-htmldocs-675570cc05eb839545ef80a812fddc2f33793955.tar.gz | |
Autogenerated HTML docs for v1.6.0.2-229-g1293c
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 3ad4e2866..a9ad58d58 100644 --- a/git-merge.html +++ b/git-merge.html @@ -565,7 +565,7 @@ merge.stat </dt>
<dd>
<p>
- Whether to print the diffstat between ORIG_HEAD and merge result
+ Whether to print the diffstat between ORIG_HEAD and the merge result
at the end of the merge. True by default.
</p>
</dd>
@@ -827,7 +827,7 @@ Look at the originals. <em>git show :1:filename</em> shows the </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-08-24 03:33:55 UTC
+Last updated 2008-09-13 06:06:56 UTC
</div>
</div>
</body>
|