| commit | 210dfa5589f1440b7b0ad0f1d99f28b9a62d9617 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 10 Apr 2012 02:09:49 +0000 (9 21:09 -0500) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Tue, 19 Jun 2012 22:29:34 +0000 (19 23:29 +0100) | ||
| tree | de6b2188d75793dc80b700c53e67d651e3a4eae0 | treesnapshot (tar.gz zip) |
| parent | e3340b88f20ca8a1bac66f3b9584972fad60a0f3 | 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 |