global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-03 22:42:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
13381bd4d98cd9a91d021d4fa9fe94de1334b826
git/git-merge-octopus.sh
Johannes Schindelin 7d592bea92 Windows: make sure that merge-octopus only outputs LF line endings 
This happens to shut up t7602 on Windows which would otherwise take
the different line endings for a sign that the merge failed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-04-30 19:12:15 +02:00

2.2 KiB
Executable File
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink