summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Amit Bakshi <ambakshi@gmail.com>2013-05-19 06:53:48 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-20 11:18:43 -0700
commit5dbe064d8cf37142f8c76f73ae0866286a8fb018 (patch)
treeafb57a932ed32dd3942bf0c784f3c361f8b1aa10 /Documentation/git-merge-file.txt
parentGit 1.8.3-rc3 (diff)
downloadtgif-5dbe064d8cf37142f8c76f73ae0866286a8fb018.tar.xz
remote-hg: set stdout to binary mode on win32
git clone hangs on windows, and file.write would return errno 22 inside of mercurial's windows.winstdout wrapper class. This patch sets stdout's mode to binary, fixing both issues. [fc: cleaned up] Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions