diff options
Diffstat (limited to 't/t4213-log-remerge-diff.sh')
| -rwxr-xr-x | t/t4213-log-remerge-diff.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t4213-log-remerge-diff.sh b/t/t4213-log-remerge-diff.sh index 36ef17a43b..ec93b96680 100755 --- a/t/t4213-log-remerge-diff.sh +++ b/t/t4213-log-remerge-diff.sh @@ -75,7 +75,9 @@ test_expect_success 'unrelated merge: without conflicts' ' clean_output () { git name-rev --name-only --stdin | # strip away bits that aren't treated by the above - sed -e 's/^\(index\|Merge:\|Date:\).*/\1/' + sed -e 's/^\(index\).*/\1/' \ + -e 's/^\(Merge:\).*/\1/' \ + -e 's/^\(Date:\).*/\1/' } cat >expected <<EOF |