Mercurial > hg
comparison tests/test-filelog.py.out @ 18337:557c8522aec0
tests: better test coverage of merges of flags
This makes existing problems with merges of symlinks and files more obvious and
add test coverage for tricky merges without real common ancestors.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 15 Jan 2013 01:05:12 +0100 |
| parents | d76ba2090e0c |
| children |
comparison
equal
deleted
inserted
replaced
| 18336:77973b6a7b0b | 18337:557c8522aec0 |
|---|