Wed, 18 Nov 2015 14:22:52 -0800 filemerge: return whether the file was deleted
Siddharth Agarwal <sid0@fb.com> [Wed, 18 Nov 2015 14:22:52 -0800] rev 27034
filemerge: return whether the file was deleted This is required for change/delete conflict resolution -- see previous patches for more details.
Wed, 18 Nov 2015 13:55:31 -0800 filemerge: return whether the file is deleted from all other merge tools
Siddharth Agarwal <sid0@fb.com> [Wed, 18 Nov 2015 13:55:31 -0800] rev 27033
filemerge: return whether the file is deleted from all other merge tools This is required for change/delete conflicts -- see the previous patch for more information.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 tip