Mercurial > hg
log mercurial/merge.py @ 26785:e9a0d5f5c225
| age | author | description |
|---|---|---|
| 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: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 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 |
| Sat, 17 Oct 2015 01:15:34 +0900 | FUJIWARA Katsunori | merge: make in-memory changes visible to external update hooks |
| Sat, 17 Oct 2015 01:15:34 +0900 | FUJIWARA Katsunori | dirstate: make dirstate.write() callers pass transaction object to it |