Mercurial > hg
comparison mercurial/fileset.py @ 20636:12580e04cc43
tests: add test case for criss cross merge
The test do not fit in any existing test file...
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sun, 02 Mar 2014 18:25:19 +0100 |
| parents | 174d9b8baf5d |
| children | 325babf1de93 |
comparison
equal
deleted
inserted
replaced
| 20635:7cd956ace1f4 | 20636:12580e04cc43 |
|---|