| commit | de787e4ac889b42dc7a28bd80cb2190ca6189a9f | |
| 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, 25 Aug 2010 10:28:50 +0000 (25 12:28 +0200) | ||
| tree | 74ce434337cca562bcee19a63a2c424736542e17 | treesnapshot (tar.gz zip) |
| parent | 0ede5f550366208e9cfc653be49c534b9a612e4a | 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 |