| Thu, 08 Oct 2015 14:16:19 -0700 | Siddharth Agarwal | filemerge._merge: drop no longer necessary 'if r:' check | file | diff | annotate |
| Wed, 07 Oct 2015 21:22:16 -0700 | Siddharth Agarwal | filemerge: call premerge directly from main merge function | file | diff | annotate |
| Wed, 07 Oct 2015 21:28:43 -0700 | Siddharth Agarwal | filemerge: move precheck to before files are written out | file | diff | annotate |
| Wed, 07 Oct 2015 22:58:52 -0700 | Siddharth Agarwal | filemerge: move 'merging' output to before file creation | file | diff | annotate |
| Wed, 07 Oct 2015 21:21:56 -0700 | Siddharth Agarwal | filemerge.filemerge: make a tuple containing merge paths on disk | file | diff | annotate |
| Wed, 07 Oct 2015 16:14:57 -0700 | Siddharth Agarwal | filemerge: switch trymerge boolean to mergetype enum | file | diff | annotate |
| Wed, 07 Oct 2015 15:13:41 -0700 | Siddharth Agarwal | filemerge: add some merge types | file | diff | annotate |