Mercurial > hg-stable
log
age | author | description |
---|---|---|
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 |
Thu, 15 Oct 2015 01:15:22 -0700 | Siddharth Agarwal | commands.resolve: don't allow users to mark or unmark driver-resolved files |