[PATCH 0 of 4 ] Improved preparatory patches from the guard series
Laurens Holst
laurens.nospam at grauw.nl
Tue Dec 27 21:31:02 UTC 2011
PATCH 1 context: add isbinary function
See http://www.selenic.com/pipermail/mercurial-devel/2011-December/036532.html
PATCH 2 tests: add test for merging flags across renames
Some more test coverage. Is the behaviour of flags not surviving merges with renames correct?
PATCH 3 merge: turn flag merge into a separate action
PATCH 4 merge: move prompts out of manifestmerge into a separate phase
See http://www.selenic.com/pipermail/mercurial-devel/2011-December/036533.html
It’s a bit scary changing things in the merge behaviour, so please review carefully :).
More information about the Mercurial-devel
mailing list