Mercurial > hg
log
age | author | description |
---|---|---|
Tue, 24 Nov 2015 18:26:21 -0800 | Siddharth Agarwal | debugmergestate: also recognize change/delete conflicts in the merge state |
Mon, 30 Nov 2015 10:26:37 -0800 | Siddharth Agarwal | debugmergestate: print out null nodes as 'null' |
Tue, 24 Nov 2015 15:03:00 -0800 | Siddharth Agarwal | test-merge-force.t: check .orig files separately |
Tue, 24 Nov 2015 15:26:51 -0800 | Siddharth Agarwal | merge.recordupdates: mark 'a' files as added unconditionally |
Mon, 30 Nov 2015 10:19:39 -0800 | Siddharth Agarwal | merge: add a new action type representing files to add/mark as modified |
Mon, 30 Nov 2015 10:03:21 -0800 | Siddharth Agarwal | mergestate: add a cached property accessor for the local context |
Mon, 30 Nov 2015 10:05:09 -0800 | Siddharth Agarwal | mergestate: raise exception if otherctx is accessed but _other isn't set |