Mercurial > hg
log
| age | author | description |
|---|---|---|
| Thu, 15 Oct 2015 01:09:58 -0700 | Siddharth Agarwal | commands.resolve: print out warning when only driver-resolved files remain |
| Thu, 15 Oct 2015 01:06:29 -0700 | Siddharth Agarwal | merge.mergestate: set merge driver state to 's' if there's none present |
| Thu, 15 Oct 2015 01:04:46 -0700 | Siddharth Agarwal | merge.mergestate: only check for merge driver when property is accessed |
| Thu, 15 Oct 2015 01:02:32 -0700 | Siddharth Agarwal | localrepo.commit: abort if merge driver's conclude step hasn't been run yet |
| Thu, 15 Oct 2015 00:57:56 -0700 | Siddharth Agarwal | merge.mergestate: add a way to get the merge driver state |
| Thu, 15 Oct 2015 00:49:07 -0700 | Siddharth Agarwal | merge.mergestate: add a way to get the other side of the merge |
| Thu, 15 Oct 2015 00:45:20 -0700 | Siddharth Agarwal | commands.resolve: support printing out driver-resolved files |