Mercurial > hg
log tests/test-merge7.t @ 21934:0cb34b3991f8 stable
| age | author | description |
|---|---|---|
| Mon, 26 May 2014 11:44:58 -0700 | Pierre-Yves David | merge: drop the quotes around commit description |
| Thu, 08 May 2014 16:50:22 -0700 | Durham Goode | merge: add conflict marker formatter (BC) |
| Tue, 22 Apr 2014 02:10:25 +0200 | Mads Kiilerich | merge: change debug logging - test output changes but no real changes |
| Fri, 09 May 2014 14:46:50 -0500 | Matt Mackall | resolve: simplify "finished" message |
| Fri, 18 Apr 2014 22:19:25 -0700 | Gregory Szorc | resolve: print message when no unresolved files remain (issue4214) |
| Fri, 08 Feb 2013 15:23:23 +0000 | Siddharth Agarwal | manifestmerge: pass in branchmerge and force separately |
| Thu, 24 Jan 2013 23:57:44 +0100 | Mads Kiilerich | merge: delay debug messages for merge actions |