| commit | 0997d4ea1ed9c656c57fcbb5be5995763ea659b7 | |
| 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> | |
| Thu, 31 Jan 2013 23:45:44 +0000 (31 23:45 +0000) | ||
| tree | 055616e0419bfeb42084696aa3463039ec832845 | treesnapshot (tar.gz zip) |
| parent | 9d8f8b5de1acbaff56a23c2229c631ff9b954262 | 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 |