log tests/test-merge-types.out @ 12187:4a854122a1c7

age author description
Fri, 30 Jul 2010 10:32:24 +0300 timeless progress: use gerund (updating) for merge progress stable
Sun, 07 Feb 2010 17:44:30 -0600 Augie Fackler update: make calls to ui.progress()
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: refactor manifestmerge init to better report effective ancestor
Fri, 07 Nov 2008 10:27:39 +0100 Peter Arrenbrecht ui: log non-interactive default response to stdout when verbose
Fri, 21 Mar 2008 11:06:02 +0100 Dirkjan Ochtman warn about new heads on commit (issue842)
Thu, 27 Dec 2007 23:55:36 -0600 Matt Mackall update test-merge-types
Wed, 07 Nov 2007 14:38:04 -0600 Matt Mackall Mark failing test as a known bug