| Wed, 14 Oct 2015 12:57:33 -0400 | Augie Fackler | merge-tools: allow marking a mergetool as completely disabled | file | diff | annotate |
| Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge | file | diff | annotate |
| Sun, 11 Oct 2015 15:04:00 -0700 | Siddharth Agarwal | filemerge: clean up some dead code | file | diff | annotate |
| Sun, 11 Oct 2015 20:47:14 -0700 | Siddharth Agarwal | filemerge: break overall filemerge into separate premerge and merge steps | file | diff | annotate |
| Sun, 11 Oct 2015 20:04:40 -0700 | Siddharth Agarwal | filemerge: only copy to backup during premerge step | file | diff | annotate |
| Sun, 11 Oct 2015 20:02:53 -0700 | Siddharth Agarwal | filemerge: only print out "merging f" output at premerge step | file | diff | annotate |
| Thu, 08 Oct 2015 00:19:20 -0700 | Siddharth Agarwal | filemerge: deindent the parts of filemerge outside the try block | file | diff | annotate |