| commit | 499df4ca8b541fe2837ab46f1dae4574952e9f64 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 11 Jun 2010 22:44:01 +0000 (12 00:44 +0200) | ||
| committer | lmfadmin <lmfadmin@ubuntu.ubuntu-domain> | |
| Fri, 3 Sep 2010 12:28:42 +0000 (3 13:28 +0100) | ||
| tree | 13e752ddaeeb223924a3b8681dae48233f33a5bc | treesnapshot (tar.gz zip) |
| parent | 5e057cab900748edee87c268d8924ca3a2b63634 | 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 |