aboutsummaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junio@pobox.com>2008-01-02 01:50:11 -0800
committerJunio C Hamano <gitster@pobox.com>2008-01-06 22:44:44 -0800
commit23707811c56a7756cbd6188e510f0a486c35c929 (patch)
tree013ac44e706c265e2543c5afca53dad4afefe591 /git-merge-stupid.sh
parent44b25b872f926ba92bae9ddf2495e7f59d0c96e2 (diff)
downloadgit-23707811c56a7756cbd6188e510f0a486c35c929.tar.gz
git-23707811c56a7756cbd6188e510f0a486c35c929.tar.xz
diff: do not chomp hunk-header in the middle of a character
We truncate hunk-header line at 80 bytes, but that 80th byte could be in the middle of a character, which is bad. This uses pick_one_utf8_char() function to make sure we do not cut a character in the middle. This assumes that the internal representation of the text is UTF-8. This needs to be extended in the future but the optimal direction has not been decided yet. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions