| commit | 2f3171f7ecd64fe45d0a7a8c2312d28c2d74fa4f | |
| 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> | |
| Tue, 28 Dec 2010 17:56:06 +0000 (28 18:56 +0100) | ||
| tree | 7e076aadcc8596a2002ec7c9a9ef62c01d4b8bdb | treesnapshot (tar.gz zip) |
| parent | 9164924e44331c89e089432222a1a1a8d1ff2376 | 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 |