Mercurial > hg
log tests/test-rename-merge1.t @ 29051:a56296f55a5e stable 3.8.1
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 |
Thu, 12 Nov 2015 13:14:03 -0800 | Martin von Zweigbergk | merge: move messages about possible conflicts a litte earlier |
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 |
Fri, 05 Dec 2014 16:13:26 -0800 | Martin von Zweigbergk | merge: don't report progress for dr/rd actions |
Tue, 22 Apr 2014 02:10:25 +0200 | Mads Kiilerich | merge: change debug logging - test output changes but no real changes |