| commit | 6470b7007669d9bba461838d8f6023ceb87680d3 | |
| 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, 8 Jan 2012 17:10:59 +0000 (8 11:10 -0600) | ||
| tree | 97aa014cf7b0f909790ee1a5d9b6e54ddae1b6ad | treesnapshot (tar.gz zip) |
| parent | e5dd45d0e94f811f428ebe33c661113cf3e42765 | 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 |