Wed, 25 Nov 2015 14:26:46 -0800 test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com> [Wed, 25 Nov 2015 14:26:46 -0800] rev 27136
test-merge-changedelete.t: print out debugmergestate We're going to use this to verify the merge state in upcoming patches.
Tue, 24 Nov 2015 18:26:21 -0800 debugmergestate: also recognize change/delete conflicts in the merge state
Siddharth Agarwal <sid0@fb.com> [Tue, 24 Nov 2015 18:26:21 -0800] rev 27135
debugmergestate: also recognize change/delete conflicts in the merge state We're going to use this for tests in upcoming patches.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 tip