| commit | 955c69b038a24560b0ad7f5df87915768e65d0d4 | |
| 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, 20 Dec 2013 00:24:44 +0000 (19 18:24 -0600) | ||
| tree | daaddeba11bddc40ff412ce3e5ada8312f085ea5 | treesnapshot (tar.gz zip) |
| parent | 97689afba41b6e24a9f0f3fb198043c432c20f35 | 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 |