smashwilson/merge-conflicts — pull request #53 by frk1705 (2014-05-24 22:29:33+00:00)
Title: Conflict regex for windows

### Fixes #50

If there is one thing I have never unterstood its regex, so please take a look if it works the way its supposed to, especially on darwin/linux.