summaryrefslogtreecommitdiff
path: root/t/t5514-fetch-multiple.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-14 21:39:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-14 21:39:56 -0700
commite6d29a4b47cf476e18658609033bdee4c42db3b8 (patch)
tree408497238b9a9f254cfcc54c7b51480bf58b5356 /t/t5514-fetch-multiple.sh
parentMerge branch 'cn/branch-set-upstream-to' (diff)
parentll-merge: warn about inability to merge binary files only when we can't (diff)
downloadtgif-e6d29a4b47cf476e18658609033bdee4c42db3b8.tar.xz
Merge branch 'jc/ll-merge-binary-ours'
"git merge -Xtheirs" did not help content-level merge of binary files; it should just take their version. Also "*.jpg binary" in the attributes did not imply they should use the binary ll-merge driver. * jc/ll-merge-binary-ours: ll-merge: warn about inability to merge binary files only when we can't attr: "binary" attribute should choose built-in "binary" merge driver merge: teach -Xours/-Xtheirs to binary ll-merge driver
Diffstat (limited to 't/t5514-fetch-multiple.sh')
0 files changed, 0 insertions, 0 deletions