summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-05-23 12:06:31 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-05-23 12:06:31 +0000
commit6ec42d93cb3e75d5d9ca265f6b74e1ed626d650b (patch)
treedf9f62a58c3cf1f4796aed4c2e6b3ecf99735a3f
parented83f28e93aec42896ea6634bf3beb2843036935 (diff)
downloadrockbox-6ec42d93cb3e75d5d9ca265f6b74e1ed626d650b.tar.gz
rockbox-6ec42d93cb3e75d5d9ca265f6b74e1ed626d650b.tar.bz2
rockbox-6ec42d93cb3e75d5d9ca265f6b74e1ed626d650b.zip
Added -b to diff command
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@666 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-xCVSROOT/syncmail2
1 files changed, 1 insertions, 1 deletions
diff --git a/CVSROOT/syncmail b/CVSROOT/syncmail
index ba6cc90d06..ce467a80ba 100755
--- a/CVSROOT/syncmail
+++ b/CVSROOT/syncmail
@@ -115,7 +115,7 @@ def calculate_diff(filespec, contextlines):
difftype = "-C " + str(contextlines)
else:
difftype = "-uN"
- diffcmd = '/usr/bin/cvs -f diff -kk %s -r %s -r %s %s' % (
+ diffcmd = '/usr/bin/cvs -f diff -kk %s -b -r %s -r %s %s' % (
difftype, oldrev, newrev, file)
fp = os.popen(diffcmd)
lines = fp.readlines()