git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-25 10:36:03 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
c7947caeab3c8b80b1ca4eb8a17c94de6fb2b5f7
git/git-merge-octopus.sh
Johannes Schindelin d676d81eb5 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>
2015-09-29 16:45:24 +02:00

2.2 KiB
Executable File
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink