summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-04-30 13:50:27 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-04-30 13:50:27 +0900
commit93e0b28dbb4c1a2cbdce1da8e229af075c2fa092 (patch)
treea2c31aa765f27d752d2a20b1c94586202dcde8dc /t/t3309-notes-merge-auto-resolve.sh
parentMerge branch 'vs/completion-with-set-u' (diff)
parentdoc: clarify the filename encoding in git diff (diff)
downloadtgif-93e0b28dbb4c1a2cbdce1da8e229af075c2fa092.tar.xz
Merge branch 'ab/pathname-encoding-doc'
Clarify that pathnames recorded in Git trees are most often (but not necessarily) encoded in UTF-8. * ab/pathname-encoding-doc: doc: clarify the filename encoding in git diff
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions