log tests/test-merge7.out @ 3245:3bdeca8946a6

age author description
Mon, 02 Oct 2006 12:04:48 -0500 Matt Mackall merge: extend file merge function for renames
Sun, 17 Sep 2006 21:27:30 -0500 Matt Mackall merge: simplify actions with helper function
Sun, 17 Sep 2006 17:13:02 -0500 Matt Mackall merge: remove linear variable