| commit | 63539520b24eaf426ddaa96a436ae7220be685d0 | |
| 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> | |
| Tue, 5 Jun 2012 18:44:18 +0000 (5 13:44 -0500) | ||
| tree | 3416e64052f4cb897e72798ea9b0ee2fde3acb05 | treesnapshot (tar.gz zip) |
| parent | db7bc76e0a17a1601dc787802c8eac27f14a210d | 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 |