Sun, 22 Nov 2015 21:58:28 -0800 | Siddharth Agarwal | merge.applyupdates: create absentfilectxes for change/delete conflicts | changeset | files |
Sun, 22 Nov 2015 21:59:52 -0800 | Siddharth Agarwal | mergestate: add methods to queue files to remove, add or get | changeset | files |
Sun, 15 Nov 2015 21:27:22 -0800 | Siddharth Agarwal | resolve: record dirstate actions after performing resolutions | changeset | files |
Fri, 20 Nov 2015 16:55:01 -0800 | Siddharth Agarwal | mergestate: add a way to record pending dirstate actions | changeset | files |
Sun, 15 Nov 2015 21:55:46 -0800 | Siddharth Agarwal | merge.recordupdates: don't require action keys to be present in dict | changeset | files |
Mon, 23 Nov 2015 10:13:05 -0500 | Augie Fackler | histedit: constant-ify the constraints list | changeset | files |
Tue, 17 Nov 2015 15:04:31 -0800 | Mateusz Kwapich | histedit: add an experimental base action | changeset | files |
Tue, 17 Nov 2015 17:53:52 -0800 | Mateusz Kwapich | histedit: add abortdirty function | changeset | files |