Mercurial > hg
comparison tests/test-commandserver.py @ 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 | e34106fa0dc3 |
| children | 1c8e0d6ac3b0 |
comparison
equal
deleted
inserted
replaced
| 18336:77973b6a7b0b | 18337:557c8522aec0 |
|---|