conflict and don't exist on all heads to merge.\r
</p>\r
</dd>\r
+<dt>\r
+--relative-date\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show dates relative to the current time, e.g. "2 hours ago".\r
+ Only takes effect for dates shown in human-readable format,\r
+ such as when using "--pretty".\r
+</p>\r
+</dd>\r
</dl>\r
</div>\r
<h2>Author</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Aug-2006 10:04:25 UTC\r
+Last updated 29-Aug-2006 04:02:36 UTC\r
</div>\r
</div>\r
</body>\r
After a failed merge, show refs that touch files having a
conflict and don't exist on all heads to merge.
+--relative-date::
+ Show dates relative to the current time, e.g. "2 hours ago".
+ Only takes effect for dates shown in human-readable format,
+ such as when using "--pretty".
+
Author
------
Written by Linus Torvalds <torvalds@osdl.org>