| commit | 0b640087b5a61a45e96a458d8b64912d390f6ef9 | |
| 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> | |
| Mon, 5 Jul 2010 09:10:47 +0000 (5 11:10 +0200) | ||
| tree | 17fa7384bf896c9725133b05e1acc72ac5713e61 | treesnapshot (tar.gz zip) |
| parent | f0073238db58b09e32a718f50b7f761a0ebd3cc4 | 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 |