| commit | 44beade13dc41c1b4354ee9bfe2abe19d3d14b82 | |
| 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, 14 Feb 2012 20:00:09 +0000 (14 14:00 -0600) | ||
| tree | c4908f14236cdf68ee52b6e9ba638cbc6d538d35 | treesnapshot (tar.gz zip) |
| parent | 5a9ec6f4a5e0a0225320f3969f0044247a5659f1 | 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 |