summaryrefslogtreecommitdiff
path: root/mergetools/diffuse
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-07 11:08:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-07 11:08:38 -0700
commitae80b5a8928770a2b56c390d13bd3c48ebd2255f (patch)
treedef201c30c9130ef7df45337f8232e777160dcb0 /mergetools/diffuse
parentMerge branch 'pw/p4-use-client-spec-branch-detection' (diff)
parentcommit/commit-tree: correct latin1 to utf-8 (diff)
downloadtgif-ae80b5a8928770a2b56c390d13bd3c48ebd2255f.tar.xz
Merge branch 'lt/commit-tree-guess-utf-8'
Teach "git commit" and "git commit-tree" the "we are told to use utf-8 in log message, but this does not look like utf-8---attempt to pass it through convert-from-latin1-to-utf8 and see if it makes sense" heuristics "git mailinfo" already uses. * lt/commit-tree-guess-utf-8: commit/commit-tree: correct latin1 to utf-8
Diffstat (limited to 'mergetools/diffuse')
0 files changed, 0 insertions, 0 deletions