diff options
Diffstat (limited to 'tests/test-merge-prompt.t')
| -rw-r--r-- | tests/test-merge-prompt.t | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test-merge-prompt.t b/tests/test-merge-prompt.t index 43f39c2..58d0f99 100644 --- a/tests/test-merge-prompt.t +++ b/tests/test-merge-prompt.t @@ -77,7 +77,7 @@ Interactive merge: $ status --- status --- - file2: * (glob) + file2: No such file or directory C file1 --- file1 --- 1 @@ -133,7 +133,7 @@ Interactive merge with not enough input: $ status --- status --- - file2: * (glob) + file2: No such file or directory C file1 --- file1 --- 1 |