| commit | 895184e595ddb6ab84b3001ce039ca807c6a015b | |
| 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> | |
| Sat, 12 Jun 2010 11:09:33 +0000 (12 13:09 +0200) | ||
| tree | 377a8b32fe3f48081982e5debd82a86a2234fa0c | treesnapshot (tar.gz zip) |
| parent | 5b82c4d7b51331ee8f4f414cd784ed848b502524 | 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 |