Mercurial > hg
graph
-
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