summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-config-explicit-merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-03-16 08:24:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-16 08:24:20 -0700
commit0987145dd3d11373270c1e0cfbd449f2c6c834c9 (patch)
treed088652b6cce0bc844da014edf615a26847ecad3 /t/t5515/fetch.br-config-explicit-merge
parentMerge branch 'jc/maint-verify-objects-remove-pessimism' (diff)
parentDocumentation/difftool: add deltawalker to list of valid diff tools (diff)
downloadtgif-0987145dd3d11373270c1e0cfbd449f2c6c834c9.tar.xz
Merge branch 'th/mergetools-deltawalker'
* th/mergetools-deltawalker: Documentation/difftool: add deltawalker to list of valid diff tools
Diffstat (limited to 't/t5515/fetch.br-config-explicit-merge')
0 files changed, 0 insertions, 0 deletions