| commit | 21b602ee90c86779eb23a8e5914f3895cb823aa7 | |
| 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, 1 Oct 2010 22:27:32 +0000 (1 23:27 +0100) | ||
| tree | c21dd75f7dfe0c4434c9d5267f5e57e5ecc0be9b | treesnapshot (tar.gz zip) |
| parent | bf458f5c59afd12abb5393b6aa14e47fc8d302aa | 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 |