| commit | e0f2d8fa4041eeb7dd8e16c3c7a80278c1bbbb29 | |
| 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> | |
| Sun, 19 Dec 2010 22:16:05 +0000 (19 23:16 +0100) | ||
| tree | 29c8c3b4889a5c2a662a8a003ea9e1abcaf86359 | treesnapshot (tar.gz zip) |
| parent | 50fa1769c7aec27f7981f8d8482d8a5b71a944da | 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 |