# HG changeset patch # User Matt Mackall # Date 2006-10-06 22:14:50 # Node ID f49c90b468975f3a49b0f5c1340eb04301f80eb3 # Parent 45b639607e52b3a1c3db8e37790d8333d1b06189 Update test output diff --git a/tests/test-rename-merge2.out b/tests/test-rename-merge2.out --- a/tests/test-rename-merge2.out +++ b/tests/test-rename-merge2.out @@ -302,7 +302,7 @@ M b -------------- -------------- -test L:nc a b R:up a b W: - 16 merge a, merge b no ancestor +test L:nc a b R:up a b W: - 16 get a, merge b no ancestor -------------- resolving manifests overwrite None branchmerge True partial False @@ -325,7 +325,7 @@ M b -------------- -------------- -test L:up a b R:nc a b W: - 17 merge a, merge b no ancestor +test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor -------------- resolving manifests overwrite None branchmerge True partial False @@ -369,7 +369,7 @@ M b -------------- -------------- -test L:up a b R:nm a b W: - 19 merge b no ancestor, remove a +test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a -------------- resolving manifests overwrite None branchmerge True partial False