diff --git a/tests/test-confused-revert.out b/tests/test-confused-revert.out new file mode 100644 --- /dev/null +++ b/tests/test-confused-revert.out @@ -0,0 +1,17 @@ +%%% should show a removed and b added +A b +R a +reverting... +%%% should show b unknown and a back to normal +? b +merging a +%%% should show foo-b +foo-b +%%% should show a removed and b added +A b +R a +reverting... +%%% should show b unknown and a marked modified (merged) +? b +%%% should show foo-b +foo-b