log tests/test-merge7.out @ 3122:2ef0b3aae186

age author description
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
Tue, 22 Aug 2006 19:32:16 -0500 Matt Mackall merge: use context code to retrieve manifests