log tests/test-merge10.out @ 7379:ef22cb8896d6

age author description
Thu, 10 Apr 2008 15:02:24 -0500 Matt Mackall merge: introduce mergestate
Fri, 21 Mar 2008 14:52:24 +0100 Adrian Buehlmann clone: print "updating working directory" status message
Wed, 16 Jan 2008 11:14:24 -0600 Matt Mackall diff: don't show function name by default
Sat, 23 Jun 2007 22:43:46 -0500 Giorgos Keramidas tests: add merge test for changeset 9fe267f77f56