| commit | ee146da575029f58254050891408764837141830 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 10 Apr 2012 02:09:49 +0000 (9 21:09 -0500) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sat, 12 May 2012 04:25:48 +0000 (11 23:25 -0500) | ||
| tree | 51084c45aadb65f044d2c1f2894f2be113fadd7d | treesnapshot (tar.gz zip) |
| parent | 42ebb1ccf5eda2bf1d52c2c1175a0c00bfb4a119 | 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 |