summaryrefslogtreecommitdiff
path: root/mergetools/winmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 13:38:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 13:38:19 -0700
commit3efeb513281ed59cc4c62be53256fd59832caa23 (patch)
tree03503031e7e0f43454127ba52e3e69643795659e /mergetools/winmerge
parentMerge branch 'cb/t7810-test-label-fix' (diff)
parentgit-p4: correct hasBranchPrefix verbose output (diff)
downloadtgif-3efeb513281ed59cc4c62be53256fd59832caa23.tar.xz
Merge branch 'ao/p4-has-branch-prefix-fix'
A bug, which caused "git p4" while running under verbose mode to report paths that are omitted due to branch prefix incorrectly, has been fixed; the command said "Ignoring file outside of prefix" for paths that are _inside_. * ao/p4-has-branch-prefix-fix: git-p4: correct hasBranchPrefix verbose output
Diffstat (limited to 'mergetools/winmerge')
0 files changed, 0 insertions, 0 deletions