| commit | 6cdf307d7911099fd824dde3d2628a531be0aab6 | |
| 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> | |
| Sat, 10 May 2014 21:56:40 +0000 (10 16:56 -0500) | ||
| tree | c251c9a5f27e1dc4c431359b94c3a905ef1b5138 | treesnapshot (tar.gz zip) |
| parent | 9be964caf47c114a7513e0f7f9959d0b9a407555 | 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 |