cvsimport: have default merge regex allow for dashes in the branch name
authorPhilippe Bruhat (BooK <book@cpan.org>
Thu, 28 Feb 2008 10:18:21 +0000 (11:18 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sat, 1 Mar 2008 08:55:38 +0000 (00:55 -0800)
commitfbbbc362ab9d3a8d76eb4273e65fb1fb26849d75
tree7dd28017699d1dab4dbf0d7f4ca1fb624543a392
parentb75bb1d695b0958d77b7894fa4a7dbc76167b65a
cvsimport: have default merge regex allow for dashes in the branch name

The default value of @mergerx uses \w, which matches word
character; a branch name like policy-20050608-br will not be
matched.

Signed-off-by: Philippe Bruhat (BooK) <book@cpan.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-cvsimport.perl