| commit | 639a42cf42326f2dccff21ebf4d132252421a2da | |
| 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, 24 Oct 2011 15:05:48 +0000 (24 10:05 -0500) | ||
| tree | d11c4ebffb69213f7e52cff4b0dff81321fc5b13 | treesnapshot (tar.gz zip) |
| parent | b2c5f24557bd549b9d7f4e2dd3a096fb81ffd829 | 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 |