Mercurial > hg
graph
-
debugmergestate: also recognize change/delete conflicts in the merge stateTue, 24 Nov 2015 18:26:21 -0800, by Siddharth Agarwal
-
debugmergestate: print out null nodes as 'null'Mon, 30 Nov 2015 10:26:37 -0800, by Siddharth Agarwal
-
test-merge-force.t: check .orig files separatelyTue, 24 Nov 2015 15:03:00 -0800, by Siddharth Agarwal
-
merge.recordupdates: mark 'a' files as added unconditionallyTue, 24 Nov 2015 15:26:51 -0800, by Siddharth Agarwal
-
merge: add a new action type representing files to add/mark as modifiedMon, 30 Nov 2015 10:19:39 -0800, by Siddharth Agarwal
-
mergestate: add a cached property accessor for the local contextMon, 30 Nov 2015 10:03:21 -0800, by Siddharth Agarwal
-
mergestate: raise exception if otherctx is accessed but _other isn't setMon, 30 Nov 2015 10:05:09 -0800, by Siddharth Agarwal
-
pager: improve help for --pager=Mon, 30 Nov 2015 18:47:33 +0000, by timeless
-
setup: remove unused py_modules argument to setup()Tue, 24 Nov 2015 21:17:26 -0800, by Gregory Szorc
-
test-merge-changedelete.t: add resolve --list outputMon, 23 Nov 2015 13:45:56 -0800, by Siddharth Agarwal
-
test-merge-changedelete.t: add a file with regular merge conflictsMon, 23 Nov 2015 13:43:14 -0800, by Siddharth Agarwal
-
filemerge: in ':prompt', use ':fail' tool rather than returning directlyTue, 24 Nov 2015 10:58:35 -0800, by Siddharth Agarwal
-
filemerge: in ':fail' tool, write out other side if local side is deletedTue, 24 Nov 2015 10:57:01 -0800, by Siddharth Agarwal
-
mergestate: explicitly forget 'dc' conflicts where the deleted side is pickedMon, 23 Nov 2015 18:03:25 -0800, by Siddharth Agarwal
-
merge.applyupdates: add all actions returned from merge stateMon, 23 Nov 2015 19:06:15 -0800, by Siddharth Agarwal
-
identify: refer to log to be able to view full hashesFri, 27 Nov 2015 20:23:23 +0100, by Mathias De Maré