summaryrefslogtreecommitdiffstats
path: root/kompare/tests/diff/unifiedm.diff
diff options
context:
space:
mode:
Diffstat (limited to 'kompare/tests/diff/unifiedm.diff')
-rw-r--r--kompare/tests/diff/unifiedm.diff5
1 files changed, 1 insertions, 4 deletions
diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff
index 85adad04..1b62d739 100644
--- a/kompare/tests/diff/unifiedm.diff
+++ b/kompare/tests/diff/unifiedm.diff
@@ -112,7 +112,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
tqWarning( "arguments do not match" );
exit(1);
}
-@@ -266,78 +295,479 @@
+@@ -266,78 +295,476 @@
}
}
@@ -646,9 +646,6 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
return 0;
}
-+
-+// vim: set ts=8 sts=4 sw=4 noet:
-+
diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
--- dcop/client/dcopfind.cpp Wed Jan 30 22:38:07 2002
+++ dcop2/client/dcopfind.cpp Wed Jan 30 22:37:04 2002