diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-01-19 00:37:50 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-01-19 00:37:50 +0000 |
| commit | 7c73c663897cfb2796fa93efc40ebe4ea33a3db1 (patch) | |
| tree | 1f9d377ee80bb9eada67fc063f87c517dffa8832 /git-rerere.html | |
| parent | 2d47c62a3df350dff294aba379e2a5430fd130d1 (diff) | |
| download | git-htmldocs-7c73c663897cfb2796fa93efc40ebe4ea33a3db1.tar.gz | |
Autogenerated HTML docs for v1.5.0-rc1-g72fe
Diffstat (limited to 'git-rerere.html')
| -rw-r--r-- | git-rerere.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rerere.html b/git-rerere.html index 2cd980d93..2a2beef86 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -266,7 +266,7 @@ git-rerere(1) Manual Page <h2>NAME</h2>
<div class="sectionbody">
<p>git-rerere -
- Reuse recorded resolve
+ Reuse recorded resolution of conflicted merges
</p>
</div>
</div>
@@ -482,7 +482,7 @@ conflict.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 17-Jan-2007 17:42:16 UTC
+Last updated 19-Jan-2007 00:37:32 UTC
</div>
</div>
</body>
|