| commit | 5e37e4001de3dc62034c059a2e8af7c0c3156f29 | |
| 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> | |
| Fri, 11 Apr 2014 15:49:22 +0000 (11 17:49 +0200) | ||
| tree | b4336446bc5c8e3e1582070567a75e326eab0c39 | treesnapshot (tar.gz zip) |
| parent | bf7ca98d53884a838746630cd1a72ac56af48715 | 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 |