Mercurial > hg
diff tests/test-rename-merge2.out @ 5764:8a5d8fb59ed2
Backed out changeset c2a21fe60994
Unfortunately, this breaks backward compatibility.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 31 Dec 2007 17:47:02 -0600 |
| parents | c2a21fe60994 |
| children | c704b03884ef |
line wrap: on
line diff
--- a/tests/test-rename-merge2.out Sun Dec 30 17:45:26 2007 +0100 +++ b/tests/test-rename-merge2.out Mon Dec 31 17:47:02 2007 -0600 @@ -22,7 +22,7 @@ -------------- M b a -= a +C a -------------- -------------- @@ -126,7 +126,7 @@ (branch merge, don't forget to commit) -------------- M b -= a +C a -------------- -------------- @@ -147,8 +147,8 @@ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -------------- -= a -= b +C a +C b -------------- -------------- @@ -194,7 +194,7 @@ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -------------- -= b +C b -------------- -------------- @@ -244,7 +244,7 @@ (branch merge, don't forget to commit) -------------- M c -= b +C b -------------- -------------- @@ -264,7 +264,7 @@ (branch merge, don't forget to commit) -------------- M b -= a +C a -------------- -------------- @@ -370,7 +370,7 @@ (branch merge, don't forget to commit) -------------- M b -= a +C a -------------- -------------- @@ -412,7 +412,7 @@ (branch merge, don't forget to commit) -------------- M b -= a +C a -------------- --------------