summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-27 10:04:26 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-27 10:04:26 -0800
commit6f0c33666300ccf95eb4b4e723e07a3c588d12db (patch)
treea70a955112a0fbaa9aac9956a2521259ee4f7b0c /mergetools/opendiff
parentMerge branch 'wk/man-deny-current-branch-is-default-these-days' into maint (diff)
parentparse-options: report uncorrupted multi-byte options (diff)
downloadtgif-6f0c33666300ccf95eb4b4e723e07a3c588d12db.tar.xz
Merge branch 'ef/non-ascii-parse-options-error-diag' into maint
* ef/non-ascii-parse-options-error-diag: parse-options: report uncorrupted multi-byte options
Diffstat (limited to 'mergetools/opendiff')
0 files changed, 0 insertions, 0 deletions