| commit | ed8552c831e8df535244f39e31cc8d3c9d0bf284 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 11 Jun 2010 22:44:01 +0000 (12 00:44 +0200) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Tue, 6 Dec 2011 00:16:47 +0000 (6 00:16 +0000) | ||
| tree | 0da5cf1d1d533f534cb8aa0d6ee34294e9a028bd | treesnapshot (tar.gz zip) |
| parent | 21016395c49dc36f2ced6bd8b660d99753087085 | 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 |