| commit | c6490b558649a7a1908097206cef1fd8da799b4e | |
| 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> | |
| Tue, 13 Mar 2012 05:44:25 +0000 (13 00:44 -0500) | ||
| tree | a3fb684be7d44569dd551156e2530c9504d6d07b | treesnapshot (tar.gz zip) |
| parent | 2ca15d562ab96aa44e7345c644fe6ed0faf13d46 | 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 |