| commit | dfeaac71c516e550448a504cbe69b4339e64533f | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 11 Jun 2010 22:44:01 +0000 (12 00:44 +0200) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Wed, 1 Jun 2011 10:51:20 +0000 (1 12:51 +0200) | ||
| tree | fe6c0f89bf0bca779856bc21b3fe6d1c5aebf395 | treesnapshot (tar.gz zip) |
| parent | e869db12c53698321477acb4a6ca3668f9ed6197 | 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 |