log tests/test-merge1.t @ 12796:bc69ba99e34b stable

age author description
Sat, 09 Oct 2010 14:50:20 -0500 Matt Mackall merge: handle no file parent in backwards merge (issue2364)
Thu, 16 Sep 2010 17:51:32 -0500 Matt Mackall tests: add exit codes to unified tests
Thu, 02 Sep 2010 23:22:51 +0200 Martin Geisler tests: remove unneeded -d flags
Wed, 18 Aug 2010 05:05:51 +0530 Pradeepkumar Gayam tests: unify test-merge1 base tests/test-merge1@2ccce18df2a4