From 855db1849a116822096229f369c00f929db2336a Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 15 May 2013 10:50:29 -0700 Subject: [PATCH] [commit-patch] Whitespace --- commit-patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commit-patch b/commit-patch index fa5a37a..1df3a11 100755 --- a/commit-patch +++ b/commit-patch @@ -236,7 +236,7 @@ my ($out, $working_patch, $non_committed_patch); run([split(/ /,$vc{diff}), @changed, @removed], '>', \$working_patch, '2>', \$err);# CVS diff dies. Sigh. or die "$err\n"; unless ($working_patch =~ /^\s*$/s) { # Work around an apparent bug in darcs () run(["interdiff", $vc{patcharg}, $patch, '/dev/stdin'], '<', \$working_patch, - '>', \$non_committed_patch, '2>', \$err) or die "$err\n"; + '>', \$non_committed_patch, '2>', \$err) or die "$err\n"; run(["patch", $vc{patcharg}, "-R"], '<', \$working_patch, '>', \$out, '2>', \$err) or die "$out\n$err\n"; } run(["patch", $vc{patcharg}], '<', $patch, '>', \$out, '2>', \$err) or die "patch: $out\n$err\n"; -- 2.51.2