index dd9fff16d3067fe939642170258fffc427c77729..a446a6b5a27067d25c1d32d97ccbbd9e59e3b754 100644 (file)
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>