| commit | fb6e113eefc8ca3eabc7352f787ace7416002386 | |
| 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, 8 Jan 2011 14:15:28 +0000 (8 15:15 +0100) | ||
| tree | bc60961f69c4f98fbc1d02a34ad09b54cdbd08f1 | treesnapshot (tar.gz zip) |
| parent | a2ec96a805975edc05d58286d3fecfe9cb0c92b8 | 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 |