log

age author description
Sun, 16 Aug 2015 10:19:00 +0200 Erik Huelsmann filemerge: add 'union' merge to internal merge tool
Sun, 16 Aug 2015 00:24:29 +0200 Erik Huelsmann filemerge: split internal merge into api entry point and internal helper
Sun, 16 Aug 2015 00:00:34 +0200 Erik Huelsmann simplemerge: add 'mode' kwarg which - when 'union' - suppresses markers