Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-up-local-change.out @ 3111:40e777bda455

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove linear variable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 17:13:02 -0500
parents 92a0c2200e41
children 1c1e59aac82a
line wrap: on
line diff
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -15,7 +15,7 @@ date:        Mon Jan 12 13:46:40 1970 +0
 summary:     1
 
 resolving manifests
- overwrite False branchmerge False partial False linear True
+ overwrite False branchmerge False partial False
  ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b
  a versions differ, resolve
 remote created b
@@ -31,7 +31,7 @@ date:        Mon Jan 12 13:46:40 1970 +0
 summary:     2
 
 resolving manifests
- overwrite False branchmerge False partial False linear True
+ overwrite False branchmerge False partial False
  ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b
 remote deleted b
 removing b
@@ -49,7 +49,7 @@ date:        Mon Jan 12 13:46:40 1970 +0
 summary:     1
 
 resolving manifests
- overwrite False branchmerge False partial False linear True
+ overwrite False branchmerge False partial False
  ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b
  a versions differ, resolve
 remote created b
@@ -100,7 +100,7 @@ failed
 abort: outstanding uncommitted changes
 failed
 resolving manifests
- overwrite False branchmerge True partial False linear False
+ overwrite False branchmerge True partial False
  ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b
  a versions differ, resolve
  b versions differ, resolve