| Fri, 13 Nov 2015 23:58:05 -0800 | Siddharth Agarwal | filemerge._mergecheck: add check for change/delete conflicts | file | diff | annotate |
| Sun, 15 Nov 2015 21:40:15 -0800 | Siddharth Agarwal | filemerge._picktool: only pick from nomerge tools for change/delete conflicts | file | diff | annotate |
| Fri, 13 Nov 2015 23:52:26 -0800 | Siddharth Agarwal | filemerge: add support for change/delete conflicts to the ':prompt' tool | file | diff | annotate |
| Wed, 18 Nov 2015 15:41:50 -0800 | Siddharth Agarwal | filemerge: add support for change/delete conflicts to the ':other' merge tool | file | diff | annotate |
| Wed, 18 Nov 2015 15:40:28 -0800 | Siddharth Agarwal | filemerge: add support for change/delete conflicts to the ':local' merge tool | file | diff | annotate |
| Wed, 18 Nov 2015 14:22:52 -0800 | Siddharth Agarwal | filemerge: return whether the file was deleted | file | diff | annotate |
| Wed, 18 Nov 2015 13:55:31 -0800 | Siddharth Agarwal | filemerge: return whether the file is deleted from all other merge tools | file | diff | annotate |