Re-add the interactive merge

[stgit] / t / t0002-status.sh

diff --git a/t/t0002-status.sh b/t/t0002-status.sh
index 9b4e60d70646c3f57697572ca9822fd6586a0333..0a70f15c31389e8934a672ddb7e036c2680e28b4 100755 (executable)
--- a/t/t0002-status.sh
+++ b/t/t0002-status.sh
@@ -107,6 +107,9 @@ test_expect_success 'Make a conflicting patch' '
 '
 
 cat > expected.txt <<EOF
+? foo/bar.ancestor
+? foo/bar.current
+? foo/bar.patched
 A fie
 C foo/bar
 EOF