log tests/test-double-merge.out @ 10965:7faef79a89c7

age author description
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()
Sat, 05 Sep 2009 18:56:51 +0200 Patrick Mezard merge: exclude common ancestor from --preview (issue1818)
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: refactor manifestmerge init to better report effective ancestor
Thu, 14 May 2009 16:03:17 +0200 Dirkjan Ochtman merge: add -S/--show option to review revisions without merging
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
Wed, 01 Aug 2007 12:33:12 -0500 Matt Mackall merge: do early copy to deal with issue636