CODEWITHSUNDEEP
mercurialmerge
Brandon Leiran
Brandon Leiran

Reputation: 5431

In mercurial, how do I get a preview of the number of files with true conflicts?

I'd like a quick way to know how many conflicts I will need to merge manually. Is this built-in? Or is there an existing tool to use as the merger to just count this?

Upvotes: 2

Views: 462

Answers (1)

Ry4an Brase
Ry4an Brase

Reputation: 78330

There's no built in predictor command, as it would take as much effort computationally as doing the merge. However, if you do a hg --config ui.merge=internal:fail merge it will exit immediately and you can do a hg resolve --list.

That will show you what you're in for, and you can either continue with hg resolve --all or give up with hg update -C .

Upvotes: 3

Related Questions