| commit | 1d4af23a3cb915f7a98fa28d597f6ca936d7acf7 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 10 Apr 2012 02:09:49 +0000 (9 21:09 -0500) | ||
| committer | Karsten Blees <blees@dcon.de> | |
| Sat, 16 Aug 2014 00:59:58 +0000 (16 02:59 +0200) | ||
| tree | 3519d64f8f80af42e89b5e00918e79a2fa62474f | treesnapshot (tar.gz zip) |
| parent | 29453a1de5c52865ead8b97ff6481ae0fda57ec2 | 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 |