[PATCH 5 of 6 checkunknown] merge: respect checkunknown and checkignored for force merges

Siddharth Agarwal sid at less-broken.com
Mon Feb 8 17:28:31 EST 2016


On 2/3/16 13:08, Martin von Zweigbergk wrote:
> When I read the subject line, I thought this was about "hg merge
> --force". Would it be accurate to change it to "rebase: respect
> checkunknown and checkignored"?

You're right. Maybe

"rebase: respect checkunknown and checkignored in more cases"


More information about the Mercurial-devel mailing list