mndrix/merge-this — pull request #3 by Mathiasdm (2012-05-09 07:12:48+00:00)
Title: Small issue fixes

Hello,

I've made a few small fixes; see below.
- Mercurial pops up a merge window, while it should stick to the internal merge algorithm for this test.
- sed didn't seem to work correctly for me (My fix fixes this for me, it may break it for others, I'm not sure).