| commit | 32645a35972485dfb14dee2f0e36e71e09f7f626 | |
| 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> | |
| Thu, 17 Feb 2011 12:36:21 +0000 (17 13:36 +0100) | ||
| tree | b254298d4f787cd1fd175ab41d7f5801de50c50c | treesnapshot (tar.gz zip) |
| parent | c5843bec6268cd725c706f1776facd97f4634c1d | 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 |