Wed, 18 Nov 2015 15:41:50 -0800 | Siddharth Agarwal | filemerge: add support for change/delete conflicts to the ':other' merge tool | changeset | files |
Wed, 18 Nov 2015 15:40:28 -0800 | Siddharth Agarwal | filemerge: add support for change/delete conflicts to the ':local' merge tool | changeset | files |
Thu, 19 Nov 2015 10:50:02 -0800 | Siddharth Agarwal | merge.mergestate: compute dirstate action | changeset | files |
Wed, 18 Nov 2015 14:22:52 -0800 | Siddharth Agarwal | filemerge: return whether the file was deleted | changeset | files |
Wed, 18 Nov 2015 13:55:31 -0800 | Siddharth Agarwal | filemerge: return whether the file is deleted from all other merge tools | changeset | files |
Wed, 18 Nov 2015 13:52:28 -0800 | Siddharth Agarwal | filemerge: return whether the file is deleted for nomerge internal tools | changeset | files |
Wed, 18 Nov 2015 15:46:45 -0800 | Siddharth Agarwal | mergestate: allow storing and retrieving change/delete conflicts | changeset | files |