log tests/test-rebase-conflicts @ 12261:fac20d9b7cf2

age author description
Fri, 21 May 2010 20:55:18 +0900 Yuya Nishihara tests: fix bashism to load helpers.sh
Wed, 19 May 2010 20:20:12 -0500 Matt Mackall rebase: use helpers.sh in tests
Sun, 26 Apr 2009 14:49:49 +0200 Martin Geisler tests: removed redundant "-u test" from test scripts
Tue, 16 Sep 2008 17:51:14 +0200 Stefano Tortarolo rebase: avoid redundant merges (issue1301)
Tue, 19 Aug 2008 18:07:26 -0700 Brendan Cully Debashify rebase tests
Mon, 18 Aug 2008 21:16:31 +0200 Stefano Tortarolo Add rebase extension