| commit | 79a382f031c857b0c79f2887a42a3b14c2588e90 | |
| 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, 1 Jun 2011 10:37:19 +0000 (1 12:37 +0200) | ||
| tree | ee62ff78c9bf2abd848a42c6a18fb8834abd501c | treesnapshot (tar.gz zip) |
| parent | fe6643e1f41837a1f15680c56a424e6a9466167d | 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 |