Mercurial > hg
log tests/test-merge-criss-cross.t @ 28669:c4b727795d6a
| age | author | description |
|---|---|---|
| Tue, 02 Feb 2016 15:24:11 +0000 | Pierre-Yves David | update: change default destination to tipmost descendant (issue4673) (BC) |
| Fri, 05 Feb 2016 10:22:14 -0800 | Durham Goode | merge: add file ancestor linknode to mergestate |
| Wed, 25 Nov 2015 14:25:26 -0800 | Siddharth Agarwal | filemerge: add debug output for whether this is a change/delete conflict |
| Sun, 11 Oct 2015 21:56:39 -0700 | Siddharth Agarwal | merge.mergestate: perform all premerges before any merges (BC) |
| Sun, 11 Oct 2015 20:47:14 -0700 | Siddharth Agarwal | filemerge: break overall filemerge into separate premerge and merge steps |
| Wed, 07 Oct 2015 00:01:16 -0700 | Siddharth Agarwal | filemerge: normalize 'internal:foo' names to ':foo' |
| Sat, 09 May 2015 23:40:40 -0700 | Pierre-Yves David | progress: get the extremely verbose output out of default debug |