log

age author description
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
Sun, 29 Jan 2006 14:36:11 +0100 Thomas Arendsen Hein Added missing quote in warning text to tests, too.