| commit | 253b120577ec2c8708816b7fe1064582ed24e79a | |
| 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> | |
| Fri, 17 Sep 2010 09:30:30 +0000 (17 10:30 +0100) | ||
| tree | 2b8d4d0d6d0e5b3d7712636ea08e5b945849848d | treesnapshot (tar.gz zip) |
| parent | f9b210ac478c2d8a06ea2f9a2a0154a4fd3683e4 | 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 |