log

age author description
Wed, 30 Sep 2015 19:43:51 -0700 Siddharth Agarwal merge.mergedriver: don't try resolving files marked driver-resolved
Mon, 28 Sep 2015 18:34:06 -0700 Siddharth Agarwal merge.mergestate: add support for persisting driver-resolved files
Wed, 30 Sep 2015 21:42:52 -0700 Siddharth Agarwal merge.mergestate: add support for persisting a custom merge driver