Sat, 14 Jul 2007 13:34:40 -0500 Merge with -stable
Matt Mackall <mpm@selenic.com> [Sat, 14 Jul 2007 13:34:40 -0500] rev 4879
Merge with -stable
Sat, 14 Jul 2007 12:44:47 -0500 diff: correctly handle combinations of whitespace options
Matt Mackall <mpm@selenic.com> [Sat, 14 Jul 2007 12:44:47 -0500] rev 4878
diff: correctly handle combinations of whitespace options
(0) -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 tip