log

age author description
Fri, 13 Nov 2015 23:52:26 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':prompt' tool
Wed, 18 Nov 2015 15:41:50 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':other' merge tool
Wed, 18 Nov 2015 15:40:28 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':local' merge tool
Thu, 19 Nov 2015 10:50:02 -0800 Siddharth Agarwal merge.mergestate: compute dirstate action
Wed, 18 Nov 2015 14:22:52 -0800 Siddharth Agarwal filemerge: return whether the file was deleted
Wed, 18 Nov 2015 13:55:31 -0800 Siddharth Agarwal filemerge: return whether the file is deleted from all other merge tools
Wed, 18 Nov 2015 13:52:28 -0800 Siddharth Agarwal filemerge: return whether the file is deleted for nomerge internal tools
Wed, 18 Nov 2015 15:46:45 -0800 Siddharth Agarwal mergestate: allow storing and retrieving change/delete conflicts
Thu, 19 Nov 2015 12:50:10 +0530 Shubhanshu Agrawal strip: changing bookmark argument to be a list
Sun, 15 Nov 2015 21:03:44 +0530 Shubhanshu Agrawal strip: strip a list of bookmarks
Wed, 18 Nov 2015 23:23:03 -0800 Pierre-Yves David revset: speed up '_matchfiles'
Wed, 18 Nov 2015 15:46:45 -0800 Siddharth Agarwal mergestate: handle additional record types specially