aboutsummaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-20 13:30:01 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-20 13:30:01 +0900
commit3445c3dd723b222d5ceda07b13d092d73428012e (patch)
treeefdf48b07bd250e14265b17e0a58e2bd911a56e5 /mergetools/diffmerge
parent9ddaf86b06a8078420f59aec8cab6daa93cf1a91 (diff)
parentda769d2986470931b8e80b8d14afcae3d7cc20d7 (diff)
downloadgit-3445c3dd723b222d5ceda07b13d092d73428012e.tar.gz
git-3445c3dd723b222d5ceda07b13d092d73428012e.tar.xz
Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-all
* jk/describe-omit-some-refs: describe: fix matching to actually match all patterns
Diffstat (limited to 'mergetools/diffmerge')
0 files changed, 0 insertions, 0 deletions