log tests/test-merge7.out @ 3111:40e777bda455

age author description
Sun, 17 Sep 2006 17:13:02 -0500 Matt Mackall merge: remove linear variable