| commit | 48195b03b8a02193adce46d71c960a8c2bbec331 | |
| 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> | |
| Fri, 10 Sep 2010 22:44:16 +0000 (10 23:44 +0100) | ||
| tree | 68dbddf18f9561e4a1e06bc65031e5ea4f3efd54 | treesnapshot (tar.gz zip) |
| parent | 4e424f2a23e8ca3c865a2d4672171bcd3c099295 | 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 |