Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-merge2.out @ 3288:438b0638dbf5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix undetected change bug in rename tests
author Matt Mackall <mpm@selenic.com>
date Sat, 07 Oct 2006 17:30:26 -0500
parents f49c90b46897
children 764688cf51e5
comparison
equal deleted inserted replaced
3282:f49c90b46897 3288:438b0638dbf5
14 resolving rev 14 resolving rev
15 my rev@e300d1c794ec other rev@735846fee2d7 ancestor rev@924404dff337 15 my rev@e300d1c794ec other rev@735846fee2d7 ancestor rev@924404dff337
16 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 16 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
17 (branch merge, don't forget to commit) 17 (branch merge, don't forget to commit)
18 -------------- 18 --------------
19 M a
19 M b 20 M b
20 a 21 a
21 C a
22 -------------- 22 --------------
23 23
24 -------------- 24 --------------
25 test L:nc a b R:up a W: - 2 get rem change to a and b 25 test L:nc a b R:up a W: - 2 get rem change to a and b
26 -------------- 26 --------------