Mon, 30 Jan 2006 12:04:36 +1300 Matt Mackall Merge with crew 0.8
Mon, 30 Jan 2006 12:02:12 +1300 Brendan Cully Safer version of FileMerge merge
Mon, 30 Jan 2006 12:02:06 +1300 Benoit Boissinot return a non-zero exit code when a merge failed
(0) -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 tip