Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-update-reverse.out @ 2830:49988d9f0758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew, fix most tests
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Aug 2006 13:55:18 -0500
parents 30f59f4a327e
children 92a0c2200e41
comparison
equal deleted inserted replaced
2829:4870f795f681 2830:49988d9f0758
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 force True allow False moddirstate True linear False 43 overwrite True branchmerge False partial False linear False
44 ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae 44 ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae
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