summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorPhilippe Bruhat (BooK <book@cpan.org>2008-02-28 11:18:21 +0100
committerJunio C Hamano <gitster@pobox.com>2008-03-01 00:55:38 -0800
commitfbbbc362ab9d3a8d76eb4273e65fb1fb26849d75 (patch)
tree7dd28017699d1dab4dbf0d7f4ca1fb624543a392 /cache.h
parentb75bb1d695b0958d77b7894fa4a7dbc76167b65a (diff)
downloadgit-fbbbc362ab9d3a8d76eb4273e65fb1fb26849d75.tar.gz
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>
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions