Mercurial does this, and you only have to manually resolve conflicting changes during a merge/rebase. See here

http://mercurial.selenic.com/wiki/MergeToolConfiguration

I think you might have tried this on a instance of Mercurial where the "premerge" option of the merge tool has been turned off for some reason..