One of my colleagues has issues every time he tries to use RebaseIf. RebaseIf says there are conflicts, so aborts and does a merge, but the merge seems to run successfully (without opening a merge tool), but then outputs "about: outstanding uncommitted merges"!
pulling from w:\DMS\Mercurial\BCRM
searching for changes
adding file changes
added 5 changesets with 30 changes to 29 files (+1 heads)
warning: conflicts during merge.
merging Core/Core.csproj failed!
saved backup bundle to C:.hg\strip-backup\187c4044c44b-backup.hg
rebaseif: failed to rebase, attempting merge
28 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
abort: outstanding uncommitted merges