| commit | 63398066bb7f5e4af7a9b7f8ed32e271883fbedc | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 11 Jun 2010 22:44:01 +0000 (12 00:44 +0200) | ||
| committer | Karsten Blees <blees@dcon.de> | |
| Thu, 15 Mar 2012 17:05:11 +0000 (15 18:05 +0100) | ||
| tree | b298eb622eb1e1c1b33da99eeb4125b6a63fe151 | treesnapshot (tar.gz zip) |
| parent | 24e40baef4bfaebc40a0aa472e03e1e5d4b08af2 | 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 |