| commit | 669b07c7cbb410c544b6b12931a6a112580eac4f | |
| 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> | |
| Fri, 11 May 2012 22:50:02 +0000 (11 17:50 -0500) | ||
| tree | 51084c45aadb65f044d2c1f2894f2be113fadd7d | treesnapshot (tar.gz zip) |
| parent | 341304b2ec8889b6e41184b39a7a7cfd613960d2 | 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 |