log tests/test-rebase-conflicts.out @ 11197:4bb4895e1693

age author description
Wed, 19 May 2010 19:46:39 -0500 Matt Mackall strip: be quiet about temporary internal bundle
Tue, 16 Sep 2008 17:51:14 +0200 Stefano Tortarolo rebase: avoid redundant merges (issue1301)
Mon, 18 Aug 2008 21:16:31 +0200 Stefano Tortarolo Add rebase extension