log tests/test-merge-revert.out @ 862:d70c1c31fd45

age author description
Wed, 10 Aug 2005 06:47:46 +0100 Thomas Arendsen Hein Fix 3-way-merge of original parent, workdir and new parent.