Yet Another Reason To Not Use Mercurial

The .orig files Mercurial leaves after a merge are really annoying as well. Luckily you can disable this silly behavior my modifying your $HOME/.hgrc with: [defaults] revert = --no-backup