log tests/test-merge1.out @ 3002:a31557193f3c

age author description
Tue, 22 Aug 2006 17:08:38 -0500 Matt Mackall merge: simplify working dir manifest generation
Tue, 02 May 2006 18:44:02 +0200 Thomas Arendsen Hein Make hg update more verbose by default (issue12)
Fri, 24 Mar 2006 14:53:23 +0100 mcmillen Spelling fix: "commited" -> "committed"