Mercurial > hg
log tests/test-double-merge.t @ 21771:0f3353776038
age | author | description |
---|---|---|
Tue, 22 Apr 2014 02:10:25 +0200 | Mads Kiilerich | merge: change debug logging - test output changes but no real changes |
Sun, 02 Mar 2014 18:52:16 +0100 | Mads Kiilerich | merge: keep destination filename as key in filemerge actions |
Fri, 08 Feb 2013 15:23:23 +0000 | Siddharth Agarwal | manifestmerge: pass in branchmerge and force separately |