diff --git a/tests/test-annotate b/tests/test-annotate --- a/tests/test-annotate +++ b/tests/test-annotate @@ -1,5 +1,7 @@ #!/bin/sh +HGMERGE=true; export HGMERGE + echo % init hg init