Mercurial > hg
log tests/test-merge-commit.t @ 29883:0c8c388c7d62
| age | author | description |
|---|---|---|
| Mon, 29 Feb 2016 01:01:20 -0500 | Matt Harbison | tests: flag Windows specific lines about background closing as optional |
| 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) |
| 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 |
| Tue, 22 Apr 2014 02:10:25 +0200 | Mads Kiilerich | merge: change debug logging - test output changes but no real changes |
| Fri, 08 Feb 2013 15:23:23 +0000 | Siddharth Agarwal | manifestmerge: pass in branchmerge and force separately |