Mercurial > hg
log tests/test-merge-types.t @ 24714:84859415a4c9
age | author | description |
---|---|---|
Sun, 28 Sep 2014 17:15:28 +0200 | Mads Kiilerich | filemerge: switch the default name for internal tools from internal:x to :x |
Wed, 06 Aug 2014 11:43:59 -0500 | Matt Mackall | tests: replace exit 80 with #require |
Sat, 26 Jul 2014 03:32:49 +0200 | Pierre-Yves David | resolve: add parenthesis around "no more unresolved files" message stable |
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 |