| Thu, 08 Oct 2015 12:55:45 -0700 | Pierre-Yves David | error: get Abort from 'error' instead of 'util' | file | diff | annotate |
| Wed, 12 Aug 2015 08:53:01 -0400 | Jordi Guti?rrez Hermoso | simplemerge: enable option to resolve conflicts one way | file | diff | annotate |
| Sun, 16 Aug 2015 00:00:34 +0200 | Erik Huelsmann | simplemerge: add 'mode' kwarg which - when 'union' - suppresses markers | file | diff | annotate |
| Sat, 08 Aug 2015 19:54:11 -0700 | Gregory Szorc | simplemerge: use absolute_import | file | diff | annotate |
| Thu, 07 Aug 2014 12:51:45 -0400 | Jordi Guti?rrez Hermoso | simplemerge: remove dead code | file | diff | annotate |
| Tue, 05 Aug 2014 15:10:50 -0700 | Pierre-Yves David | simplemerge: support three labels when merging | file | diff | annotate |
| Tue, 05 Aug 2014 14:56:25 -0700 | Pierre-Yves David | simplemerge: burn "minimal" feature to the ground | file | diff | annotate |