| commit | ca245cb3b6280efdc1c2227cab42e1d33b0d040c | |
| 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> | |
| Tue, 1 Feb 2011 22:23:22 +0000 (1 16:23 -0600) | ||
| tree | 4e780ab7f564e1ff53cbbccb7cd9a5adb623a66d | treesnapshot (tar.gz zip) |
| parent | 1927dd072ec4ba833cb038a4e5c19a70d8b787f5 | 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 |