| Thu, 15 Oct 2015 01:31:04 -0700 | Siddharth Agarwal | commands.resolve: conclude merge driver if no unresolved files are left | changeset | files |
| Thu, 15 Oct 2015 01:27:06 -0700 | Siddharth Agarwal | commands.resolve: call driverpreprocess if we haven't run it yet | changeset | files |
| Thu, 15 Oct 2015 01:22:01 -0700 | Siddharth Agarwal | merge.applyupdates: call driverconclude after performing merge actions | changeset | files |
| Thu, 15 Oct 2015 01:19:10 -0700 | Siddharth Agarwal | merge.applyupdates: call driverpreprocess before starting merge actions | changeset | files |
| Thu, 15 Oct 2015 01:17:29 -0700 | Siddharth Agarwal | merge: add stubs for preprocess and conclude steps of merge driver | changeset | files |
| Thu, 15 Oct 2015 01:15:22 -0700 | Siddharth Agarwal | commands.resolve: don't allow users to mark or unmark driver-resolved files | changeset | files |
| Thu, 15 Oct 2015 01:11:50 -0700 | Siddharth Agarwal | resolve: only create wctx once | changeset | files |