| Fri, 23 Oct 2015 06:06:22 -0400 | Augie Fackler | merge: improve clarity of table in update docstring | file | diff | annotate |
| Thu, 15 Oct 2015 01:22:01 -0700 | Siddharth Agarwal | merge.applyupdates: call driverconclude after performing merge actions | file | diff | annotate |
| Thu, 15 Oct 2015 01:19:10 -0700 | Siddharth Agarwal | merge.applyupdates: call driverpreprocess before starting merge actions | file | diff | annotate |
| Thu, 15 Oct 2015 01:17:29 -0700 | Siddharth Agarwal | merge: add stubs for preprocess and conclude steps of merge driver | file | diff | annotate |
| Thu, 15 Oct 2015 01:06:29 -0700 | Siddharth Agarwal | merge.mergestate: set merge driver state to 's' if there's none present | file | diff | annotate |
| Thu, 15 Oct 2015 01:04:46 -0700 | Siddharth Agarwal | merge.mergestate: only check for merge driver when property is accessed | file | diff | annotate |
| Thu, 15 Oct 2015 00:57:56 -0700 | Siddharth Agarwal | merge.mergestate: add a way to get the merge driver state | file | diff | annotate |