Mercurial > hg
log mercurial/merge.py @ 26768:ac68769a5985
age | author | description |
---|---|---|
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 |
Wed, 14 Oct 2015 15:01:07 -0700 | Siddharth Agarwal | merge.mergestate: add a generator for driver-resolved files |
Mon, 05 Oct 2015 21:42:09 -0700 | Pierre-Yves David | update: "deprecate" call to 'merge.update' without a destination |