diff options
Diffstat (limited to 't/merge-check.t')
-rwxr-xr-x | t/merge-check.t | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/merge-check.t b/t/merge-check.t index fdea318..4a50db0 100755 --- a/t/merge-check.t +++ b/t/merge-check.t @@ -43,7 +43,7 @@ try " test-commit bb cc; ok checkout master; ok; /Switched to branch 'master'/ test-commit dd ee; ok - git merge new; ok; /Merge made.*recursive/ + git merge new; ok; /Merge made/ test-commit ff; ok tag end; ok "; |