diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-07-29 08:35:21 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-07-29 08:35:21 +0000 |
| commit | 543f8d61eb235820aecefde6e46ec90e9803a6d8 (patch) | |
| tree | 927a67cd988e0c71e5bb57625adf32abcbdbb947 /git-rerere.html | |
| parent | ceec6ab20672c752adf280cfbacca126f01b7411 (diff) | |
| download | git-htmldocs-543f8d61eb235820aecefde6e46ec90e9803a6d8.tar.gz | |
Autogenerated HTML docs for v1.6.4
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 782d48778..a7dc8069d 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -337,7 +337,7 @@ hand resolutions to their corresponding automerge results.</p></div> <td class="icon">
<div class="title">Note</div>
</td>
-<td class="content">You need to set the configuration variable rerere.enabled to
+<td class="content">You need to set the configuration variable rerere.enabled in order to
enable this command.</td>
</tr></table>
</div>
@@ -528,7 +528,7 @@ conflict.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-07-01 02:31:00 UTC
+Last updated 2009-07-29 08:35:01 UTC
</div>
</div>
</body>
|