| commit | a99f0360e4f9381d5b6623bb42046faadddd180e | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 11 Jun 2010 22:44:01 +0000 (12 00:44 +0200) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Mon, 20 Sep 2010 14:53:22 +0000 (20 15:53 +0100) | ||
| tree | 8b54cfd46451ec0cc4aab28516718d271e828dff | treesnapshot (tar.gz zip) |
| parent | 8ae74eb3b81349399ce2fe9ae2f33bec2f0fdfb5 | 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 |