Mercurial > hg
comparison tests/test-revlog-ancestry.py.out @ 20642:0dc7a50345c2
merge: use the right ancestor when both sides copied the same file
The tests shows no real changes because of this ... but there must be some
weird corner cases where using the right ancestor for the merge planning is
better than using the wrong one.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 25 Feb 2014 20:29:46 +0100 |
| parents | f88c60e740a1 |
| children | b6db2e80a9ce |
comparison
equal
deleted
inserted
replaced
| 20641:3db9e798e004 | 20642:0dc7a50345c2 |
|---|