annotate tests/test-merge2.out @ 1547:4dea10839201

close .hg/hgrc after writing the default values on clone this fix a bug where Dircleanup did not work because the file was still open
author TK Soh <teekaysoh@yahoo.com>
date Tue, 15 Nov 2005 20:35:10 +0100
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
1 adding b
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
2 adding b