Thu, 12 Nov 2015 14:29:02 -0800 | Siddharth Agarwal | merge.applyupdates: only attempt to merge files in mergeactions | changeset | files |
Wed, 11 Nov 2015 17:34:28 -0800 | Siddharth Agarwal | filemerge: rename _symlinkcheck to _mergecheck | changeset | files |
Wed, 11 Nov 2015 17:32:41 -0800 | Siddharth Agarwal | test-merge-prompt.t: rename to test-merge-changedelete.t | changeset | files |