summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-05 19:37:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-05 19:37:24 (GMT)
commitf0df1293acdba9513cae17e2c63b4169f1347371 (patch)
treee4d9309caa37b13a21ad38147833ed7ee29479bd /git-send-email.perl
parent46068383aa825dfe9026f9255cea07da07e06253 (diff)
parente77095e8b8d541b41c242aa6dbc8319cb99def5e (diff)
downloadgit-f0df1293acdba9513cae17e2c63b4169f1347371.zip
git-f0df1293acdba9513cae17e2c63b4169f1347371.tar.gz
git-f0df1293acdba9513cae17e2c63b4169f1347371.tar.bz2
Merge branch 'maint-1.6.3' into maint
* maint-1.6.3: Better usage string for reflog. hg-to-git: don't import the unused popen2 module send-email: remove debug trace config: Keep inner whitespace verbatim
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl1
1 files changed, 0 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index d508f83..0700d80 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -450,7 +450,6 @@ sub check_file_rev_conflict($) {
try {
$repo->command('rev-parse', '--verify', '--quiet', $f);
if (defined($format_patch)) {
- print "foo\n";
return $format_patch;
}
die(<<EOF);