| commit | 051492aab2edbf38a4d9bfb41f6ca3b7c947dd61 | |
| 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, 29 May 2012 02:18:51 +0000 (28 21:18 -0500) | ||
| tree | dbb292e500f364cf0ad5a77d0988e081618f9e8e | treesnapshot (tar.gz zip) |
| parent | 91a54bc13b398b22a52448a1ae8494dcb6f48005 | 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 |