Mercurial: revision graph

graph

less more | rev 27125: (0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 tip

test-merge-changedelete.t: add a file with regular merge conflicts
Mon, 23 Nov 2015 13:43:14 -0800, by Siddharth Agarwal
filemerge: in ':prompt', use ':fail' tool rather than returning directly
Tue, 24 Nov 2015 10:58:35 -0800, by Siddharth Agarwal
filemerge: in ':fail' tool, write out other side if local side is deleted
Tue, 24 Nov 2015 10:57:01 -0800, by Siddharth Agarwal

less more | rev 27125: (0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 tip