log tests/test-merge-commit.out @ 11983:27649cf258e3

age author description
Fri, 30 Jul 2010 10:32:24 +0300 timeless progress: use gerund (updating) for merge progress stable
Tue, 16 Feb 2010 21:04:04 +0100 Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order 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
Thu, 10 Apr 2008 15:02:24 -0500 Matt Mackall merge: introduce mergestate
Fri, 21 Mar 2008 11:06:02 +0100 Dirkjan Ochtman warn about new heads on commit (issue842)
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: allow smarter tool configuration
Thu, 04 Oct 2007 19:44:37 -0500 Matt Mackall merge: add debug diagnostics for findcopies
Tue, 30 Jan 2007 19:09:08 -0200 Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename