| commit | 8cb21402af8628df48638cc6d14ce856a3e38aa3 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 11 Jun 2010 22:44:01 +0000 (12 00:44 +0200) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Wed, 30 Mar 2011 22:29:28 +0000 (31 00:29 +0200) | ||
| tree | 90985e7c30d06fdf018a54e8e6d2e68d6e058fc3 | treesnapshot (tar.gz zip) |
| parent | 63f6dff034ab525d5ae8cf2c6606abd3c11f9c24 | 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 |