summaryrefslogtreecommitdiff
path: root/t/t5515-fetch-merge-logic.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-05-19 10:35:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-05-19 10:35:24 -0700
commit5714722f71ea2eff99ba76fd7b04f61ba0142ea4 (patch)
tree6c46031a234a53b16598ba8c03a06060e8478c4b /t/t5515-fetch-merge-logic.sh
parentMerge git://github.com/git-l10n/git-po (diff)
parentgit-gui: tolerate major version changes when comparing the git version (diff)
downloadtgif-5714722f71ea2eff99ba76fd7b04f61ba0142ea4.tar.xz
Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
* jl/use-vsatisfy-correctly-for-2.0: git-gui: tolerate major version changes when comparing the git version
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
0 files changed, 0 insertions, 0 deletions