log tests/test-up-local-change.out @ 1637:3b1b44b917f4

age author description
Tue, 24 Jan 2006 15:02:10 +1300 mason Add new bdiff based unidiff generation.
Wed, 14 Dec 2005 22:19:03 -0600 Benoit Boissinot abort when merging two heads and repository has local changes
Mon, 26 Sep 2005 16:52:47 -0700 Matt Mackall Repair ancestor logic, fix up test cases