Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t3404: use configured shell instead of /bin/sh
[gitweb.git]
/
git-cvsimport.perl
diff --git
a/git-cvsimport.perl
b/git-cvsimport.perl
index 5694978c466df8e97483b5bdf5e9ae00b481c56c..9516242338d95687b4354a6d21692cbd10547899 100755
(executable)
--- a/
git-cvsimport.perl
+++ b/
git-cvsimport.perl
@@
-164,7
+164,7
@@
sub read_repo_config {
our @mergerx = ();
if ($opt_m) {
- @mergerx = ( qr/\
W
(?:from|of|merge|merging|merged) (\w+)/i );
+ @mergerx = ( qr/\
b
(?:from|of|merge|merging|merged) (\w+)/i );
}
if ($opt_M) {
push (@mergerx, qr/$opt_M/);