| commit | b5a1c75130866fae7154ad2db6abeb949ce2b7c0 | |
| 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> | |
| Sat, 4 Jun 2011 13:31:51 +0000 (4 15:31 +0200) | ||
| tree | 9c62f8e460deefe200855a8d208c9aecc62a5b0e | treesnapshot (tar.gz zip) |
| parent | 1a284c935fc8f0a0a14142f0f3939c433f121eab | 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 |