NullVoxPopuli/kdiff3 — pull request #1 by NullVoxPopuli (2014-12-04 15:34:39+00:00)
Title: exit with status one upon failure to merge given that the --fail argumen...

...t is passed

apparently, there are also whitespace changes (my IDE removes trailing whitespace).