git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-01 12:45:02 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
c1904dbee2aab59b5dc213960dfb2481c8d7a1bf
git/git-merge-octopus.sh
Johannes Schindelin 42e1db8c5b 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-04-01 09:48:07 +01:00

2.2 KiB
Executable File
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink