| commit | e058239f27439fcc714dbd58dbab370a86e8bf8e | |
| 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, 6 Aug 2011 11:43:14 +0000 (6 13:43 +0200) | ||
| tree | c32b082c39b60c4c604d8d4acde0f0a7e8d71adc | treesnapshot (tar.gz zip) |
| parent | a32e64d6e5666118eb6d8834d01bfce013f0cf37 | 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 |