| commit | be6a5e91517f72cf8c7511bd41580b2c5cbcab1f | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 10 Apr 2012 02:09:49 +0000 (9 21:09 -0500) | ||
| committer | Stepan Kasal <kasal@ucw.cz> | |
| Thu, 29 May 2014 08:41:34 +0000 (29 10:41 +0200) | ||
| tree | 4e68938b4019cba0d307ab399cd050a46a978f5b | treesnapshot (tar.gz zip) |
| parent | 4dd031659be9082a2aeeaca369af1df167dbc735 | 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 |