log tests/test-convert-cvs-detectmerge.t @ 12629:c623752b1af5

age author description
Wed, 29 Sep 2010 01:33:31 +0200 Mads Kiilerich test-convert-cvs-detectmerge: add sleep so cvs notices changes
Sun, 26 Sep 2010 15:42:48 -0500 Matt Mackall tests: unify test-convert-cvs-detectmerge base tests/test-convert-cvs-detectmerge@3f1276753c65