| commit | 4407414ed9ad04509c8bbbeb4282801379bb7028 | |
| 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, 15 May 2014 07:42:33 +0000 (15 09:42 +0200) | ||
| tree | c251c9a5f27e1dc4c431359b94c3a905ef1b5138 | treesnapshot (tar.gz zip) |
| parent | 9e5973abdc2f97a9cc1a839216ddadb9130a8bf5 | 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 |