Mercurial > hg
diff tests/hghave @ 20897:0b50788c160c
merge: use ancestor filename from planning phase instead of filectx ancestor
test-merge-types.t changes a bit in flag merging. It relied on the
implementation detail that 100% identical revlog entries are reused. The revlog
reuse did that fctx.ancestor() saw an ancestor where there really not was one.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 25 Feb 2014 20:30:08 +0100 |
parents | 77d06793a20d |
children | 05b3238ba901 |