log tests/test-merge5.t @ 16022:04604d1a9fc3 stable

age author description
Tue, 31 May 2011 11:52:22 -0700 Brendan Cully Make pull -u behave like pull && update
Sat, 09 Oct 2010 17:02:28 -0500 Brodie Rao update: use higher level wording for "crosses branches" error
Thu, 16 Sep 2010 17:51:32 -0500 Matt Mackall tests: add exit codes to unified tests
Thu, 02 Sep 2010 22:17:22 +0200 Martin Geisler test-merge5: removed unnecessary parts of test
Thu, 02 Sep 2010 12:48:46 -0400 Brodie Rao test-merge5: ensure updating to tip across branches is tested
Wed, 18 Aug 2010 05:15:49 +0530 Pradeepkumar Gayam tests: unify test-merge5 base tests/test-merge5@64d660b2cc76