| commit | 35315941865f52f058e224f668717f2ccd6b4294 | |
| 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> | |
| Thu, 5 Jan 2012 20:13:39 +0000 (5 14:13 -0600) | ||
| tree | a4192fde82c937b51ff61254ebfb5f7710aef95b | treesnapshot (tar.gz zip) |
| parent | 2930ac0ab542770b3809642e2413ad9c72313da9 | 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 |