summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Richard Hansen <rhansen@bbn.com>2013-11-17 23:12:42 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-11-27 12:09:50 -0800
commit5c1d2e8af99c1cf24a38fe830d96a4aedce30e2b (patch)
tree54afa76b9537fd627f2ae07ab4010b67fab5844d /Documentation/technical/trivial-merge.txt
parentGit 1.8.4.4 (diff)
downloadtgif-5c1d2e8af99c1cf24a38fe830d96a4aedce30e2b.tar.xz
remote-hg: don't decode UTF-8 paths into Unicode objects
The internal mercurial API expects ordinary 8-bit string objects, not Unicode string objects. With this change, the test-hg.sh unit tests pass again. Signed-off-by: Richard Hansen <rhansen@bbn.com> Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions