log

age author description
Tue, 20 Oct 2015 15:45:39 +0200 Pierre-Yves David bundle2: introduce an "applybundle" function
Thu, 15 Oct 2015 01:31:04 -0700 Siddharth Agarwal commands.resolve: conclude merge driver if no unresolved files are left
Thu, 15 Oct 2015 01:27:06 -0700 Siddharth Agarwal commands.resolve: call driverpreprocess if we haven't run it yet
Thu, 15 Oct 2015 01:22:01 -0700 Siddharth Agarwal merge.applyupdates: call driverconclude after performing merge actions
Thu, 15 Oct 2015 01:19:10 -0700 Siddharth Agarwal merge.applyupdates: call driverpreprocess before starting merge actions
Thu, 15 Oct 2015 01:17:29 -0700 Siddharth Agarwal merge: add stubs for preprocess and conclude steps of merge driver