log tests/test-up-local-change.out @ 3287:e93c926e069e

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 21:11:26 -0500 Matt Mackall merge: simplify local created logic