--- a/tests/test-rebase-conflicts.t Mon Dec 26 13:48:31 2011 +0100
+++ b/tests/test-rebase-conflicts.t Tue Dec 27 00:11:22 2011 +0100
@@ -3,6 +3,9 @@
> graphlog=
> rebase=
>
+ > [phases]
+ > publish=False
+ >
> [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
> EOF