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 |
Thu, 12 Nov 2015 20:48:41 -0600 | Matt Mackall | merge with stable | changeset | files |
Thu, 12 Nov 2015 13:16:04 -0800 | Gregory Szorc | tags: create new sortdict for performance reasons | changeset | files |
Tue, 10 Nov 2015 15:08:56 -0800 | Christian Delahousse | largefiles: specify where .orig files are kept | changeset | files |