Mercurial > hg
log tests/test-rename-merge2.t @ 20945:18adc15635a1
| age | author | description |
|---|---|---|
| Sun, 02 Mar 2014 18:52:16 +0100 | Mads Kiilerich | merge: keep destination filename as key in filemerge actions |
| Tue, 25 Feb 2014 20:29:14 +0100 | Mads Kiilerich | copies: when both sides made the same copy, report it as a copy |
| Tue, 25 Feb 2014 20:28:40 +0100 | Mads Kiilerich | tests: add systematic test of merge ancestor calculation |
| Mon, 29 Apr 2013 15:58:15 +0900 | FUJIWARA Katsunori | merge: increase safety of parallel updating/removing on icasefs stable |
| Sat, 09 Feb 2013 15:22:10 -0800 | Bryan O'Sullivan | tests: getremove test output changes (fold into previous patch) |
| Sat, 09 Feb 2013 15:22:04 -0800 | Bryan O'Sullivan | tests: update test output (will be folded into parent) |
| Fri, 08 Feb 2013 15:23:23 +0000 | Siddharth Agarwal | manifestmerge: pass in branchmerge and force separately |