From: Philippe Bruhat (BooK <book@cpan.org>
Date: Thu, 28 Feb 2008 10:18:21 +0000 (+0100)
Subject: cvsimport: have default merge regex allow for dashes in the branch name
X-Git-Tag: v1.5.5-rc0~87^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fbbbc362ab9d3a8d76eb4273e65fb1fb26849d75?hp=fbbbc362ab9d3a8d76eb4273e65fb1fb26849d75

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>
---