tests/test-issue672.out
changeset 5810 124577de40a7
parent 5371 17ed9b9a0d03
child 6004 5af5f0f9d724
--- a/tests/test-issue672.out	Sat Jan 05 17:36:16 2008 +0100
+++ b/tests/test-issue672.out	Sat Dec 29 16:57:43 2007 +0300
@@ -45,7 +45,7 @@
  1: remote moved to 1a -> m
 copying 1 to 1a
 merging 1 and 1a
-my 1@746e9549ea96+ other 1a@2f8037f47a5c ancestor 1@81f4b099af3d
+my 1@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d
 removing 1
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)