Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-update-reverse.out @ 3111:40e777bda455
merge: remove linear variable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 17:13:02 -0500 |
parents | 92a0c2200e41 |
children | 2ef0b3aae186 |
line wrap: on
line diff
--- a/tests/test-update-reverse.out +++ b/tests/test-update-reverse.out @@ -40,7 +40,7 @@ a side1 side2 resolving manifests - overwrite True branchmerge False partial False linear False + overwrite True branchmerge False partial False ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d remote deleted side2, clobbering remote deleted side1, clobbering