Fri, 13 Nov 2015 23:57:43 -0800 | Siddharth Agarwal | filemerge: don't try using external tools on change/delete conflicts | changeset | files |
Fri, 13 Nov 2015 23:56:00 -0800 | Siddharth Agarwal | filemerge: don't attempt to premerge change/delete conflicts | changeset | files |
Fri, 13 Nov 2015 23:58:05 -0800 | Siddharth Agarwal | filemerge._mergecheck: add check for change/delete conflicts | changeset | files |