Marco Hinz f6f6f90542 change filter regex for diff output
Diff output of files containing conflict markers start with '@@@'
opposed to 'normal' diff output with only '@@'.

I'm not sure if files with conflict markers should be handled by Sy, so
these lines get just ignored for now.

I'll add it to my TODO nevertheless.

Closes #16.
2013-04-02 20:09:05 +02:00
..