Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-rename.out @ 1782:b9671b41e360
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 21 Feb 2006 16:46:38 +0100 |
parents | 91c56c427171 |
children | 64df4220b349 |
comparison
equal
deleted
inserted
replaced
1781:284fc722c342 | 1782:b9671b41e360 |
---|---|
244 A d3/d11/a1 | 244 A d3/d11/a1 |
245 R d1/a | 245 R d1/a |
246 R d1/b | 246 R d1/b |
247 R d1/ba | 247 R d1/ba |
248 R d1/d11/a1 | 248 R d1/d11/a1 |
249 # transitive rename | |
250 A d1/bc | |
251 R d1/b | |
252 # transitive rename --after | |
253 A d1/bc | |
254 R d1/b |