| commit | 4c50dd6d1bfa29380e4c5da5e3856725ec1fba48 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 11 Jun 2010 22:44:01 +0000 (12 00:44 +0200) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Sun, 24 Apr 2011 23:42:17 +0000 (25 00:42 +0100) | ||
| tree | f1727a7f9130a9d56264c5c48a6a2a091e6815a6 | treesnapshot (tar.gz zip) |
| parent | fdf3b3f8a417af413b7707a0493d06a6aadccd46 | commitdiff |
t7602: cope with CR/LF
The output of git-merge-octopus has CR/LF line endings, so let's just
strip the CR out.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The output of git-merge-octopus has CR/LF line endings, so let's just
strip the CR out.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| t/t7602-merge-octopus-many.sh | diffblobblamehistory |