| commit | 5fa4a6aababf48a0f93b786a025bfb7b463a10bc | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 10 Apr 2012 02:09:49 +0000 (9 21:09 -0500) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Mon, 22 Oct 2012 12:29:54 +0000 (22 13:29 +0100) | ||
| tree | 9cb106da30a6d3b3a52a5b707cca38298ed396a6 | treesnapshot (tar.gz zip) |
| parent | f616e6d805d656bb8f281f28b7ccb4943b6c8a85 | commitdiff |
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>
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>
| git-merge-octopus.sh | diffblobblamehistory |