| commit | 4e319b9fd2e51a688216528bf205293572eb308c | |
| 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, 29 Jan 2012 10:57:56 +0000 (29 10:57 +0000) | ||
| tree | f7cfc5e33578b4099caa33da11cee42c72a4d68a | treesnapshot (tar.gz zip) |
| parent | 5f0eeb459b6e027796dcecf4bd3a6e50ab7c6eb2 | 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 |