Mercurial > hg
log tests/test-merge-criss-cross.t @ 27161:296d55def9c4
| age | author | description |
|---|---|---|
| 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 |
| Thu, 11 Dec 2014 20:56:53 -0800 | Martin von Zweigbergk | merge: let bid merge work on the file->action dict |
| Wed, 03 Dec 2014 14:03:20 -0800 | Martin von Zweigbergk | merge: make 'keep' message more descriptive |