| commit | 4fb1d1de6dc3f3995f6aede26bcb3bfea1c653b2 | |
| 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> | |
| Sun, 24 Oct 2010 23:04:28 +0000 (25 00:04 +0100) | ||
| tree | 15770f678a1cb09611c636cbba4631f13f783468 | treesnapshot (tar.gz zip) |
| parent | 843dc1b7af05e89db18d2f2321b4637abd6cd50b | 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 |