Mercurial > hg
comparison tests/test-conflict.t @ 20637:73a3a2386654
tests: add systematic test of merge ancestor calculation
There is probably some overlap with the existing tests - it is hard to figure
out what these tests are doing.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 25 Feb 2014 20:28:40 +0100 |
parents | 2371f4aea665 |
children | 25d5a9ecbb85 |
comparison
equal
deleted
inserted
replaced
20636:12580e04cc43 | 20637:73a3a2386654 |
---|