<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
</p>\r
</dd>\r
<dt>\r
+<a href="git-rerere.html">git-rerere(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Reuse recorded resolution of conflicted merges.\r
+</p>\r
+</dd>\r
+<dt>\r
<a href="git-reset.html">git-reset(1)</a>\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 22-Jan-2006 23:54:19 PDT\r
+Last updated 07-Feb-2006 08:04:32 UTC\r
</div>\r
</div>\r
</body>\r