[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesdk/scripts
From:       Dirk Mueller <mueller () kde ! org>
Date:       2002-12-06 5:11:29
[Download RAW message or body]

CVS commit by mueller: 

use -kk to avoid these darn merging conflicts all the time


  M +2 -2      cvslastchange   1.14


--- kdesdk/scripts/cvslastchange:1.13	Thu Oct 17 17:44:44 2002
@@ -45,5 +45,5 @@
 }
 print "cvs -f log -N -r$vnew $filename\n";
 system("cvs -f log -N -r$vnew $filename");
-print "cvs -f diff -bp -u -r$vold -r$vnew $filename\n";
-system("cvs -f diff -bp -u -r$vold -r$vnew $filename");
+print "cvs -f diff -kk -bp -u -r$vold -r$vnew $filename\n";
+system("cvs -f diff -kk -bp -u -r$vold -r$vnew $filename");

[prev in list] [next in list] [prev in thread] [next in thread]