| commit | 08642c0961dc46e14e14096a78e22fd105c4b6a4 | |
| 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> | |
| Thu, 27 Oct 2011 08:50:41 +0000 (27 09:50 +0100) | ||
| tree | 29d8a9d318937b482f54c61ccd674d05822d58e9 | treesnapshot (tar.gz zip) |
| parent | fca4a4a8550f7172738f523fda114aa016fedb1a | 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 |