summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-16 18:33:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-16 18:33:06 (GMT)
commitf357797678aa5ae35c63623b8b76eb682d5b9b79 (patch)
tree3db12220f50ea867cc876138f93bca4bde1973a7 /builtin/merge.c
parent7591e2c53c6f02626e376a98b5f95745fbfe108f (diff)
parentce856044681331d19b867426726db7edd12f1713 (diff)
downloadgit-f357797678aa5ae35c63623b8b76eb682d5b9b79.zip
git-f357797678aa5ae35c63623b8b76eb682d5b9b79.tar.gz
git-f357797678aa5ae35c63623b8b76eb682d5b9b79.tar.bz2
Merge branch 'jk/skip-prefix'
One more to an already graduated topic. * jk/skip-prefix: tag: use skip_prefix instead of magic numbers
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions