Mercurial > hg
log
| age | author | description |
|---|---|---|
| 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 |
| Thu, 15 Oct 2015 01:15:22 -0700 | Siddharth Agarwal | commands.resolve: don't allow users to mark or unmark driver-resolved files |
| Thu, 15 Oct 2015 01:11:50 -0700 | Siddharth Agarwal | resolve: only create wctx once |
| Mon, 19 Oct 2015 12:07:17 -0700 | James Mills | dirstate: fix invalid reference to self.ui |