Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-update-reverse.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 2ef0b3aae186
comparison
equal deleted inserted replaced
3110:62044d161470 3111:40e777bda455
38 Should show a side1 side2 38 Should show a side1 side2
39 a 39 a
40 side1 40 side1
41 side2 41 side2
42 resolving manifests 42 resolving manifests
43 overwrite True branchmerge False partial False linear False 43 overwrite True branchmerge False partial False
44 ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d 44 ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d
45 remote deleted side2, clobbering 45 remote deleted side2, clobbering
46 remote deleted side1, clobbering 46 remote deleted side1, clobbering
47 remote created main 47 remote created main
48 getting main 48 getting main