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)
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>
No differences found