The following commit has been merged in the master branch: commit eba97ba99e99967a7c7a752424138193d9f53454 Author: Adam D. Barratt <[EMAIL PROTECTED]> Date: Fri Nov 28 17:05:37 2008 +0000
And actually remember to delete the files diff --git a/testset/diffs/.#binary.c.1.34 b/testset/diffs/.#binary.c.1.34 deleted file mode 100644 index 9208f48..0000000 --- a/testset/diffs/.#binary.c.1.34 +++ /dev/null @@ -1 +0,0 @@ -A CVS conflict copy to trigger the diff check. diff --git a/testset/diffs/binary.c~ b/testset/diffs/binary.c~ deleted file mode 100644 index 5e0d16c..0000000 --- a/testset/diffs/binary.c~ +++ /dev/null @@ -1,5 +0,0 @@ -#include <stdio.h> - -int main () { - printf("Helooooooo nurse! :)\n"); -} -- Debian package checker -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]