Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-update-reverse.out @ 3095:92a0c2200e41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use context code to retrieve manifests
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 19:32:16 -0500
parents 49988d9f0758
children 40e777bda455
comparison
equal deleted inserted replaced
3007:962b9c7df641 3095:92a0c2200e41
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 linear False
44 ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae 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
49 removing side1 49 removing side1