Fri, 13 Nov 2015 23:58:05 -0800 | Siddharth Agarwal | filemerge._mergecheck: add check for change/delete conflicts | changeset | files |
Sun, 15 Nov 2015 21:40:15 -0800 | Siddharth Agarwal | filemerge._picktool: only pick from nomerge tools for change/delete conflicts | changeset | files |