checkout --conflict=diff3: add a label for ancestor

diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index bb4cf00d78637b3bdf0c4e3da99291e0ab3c718f..7f858151d4d7c1548803944de0dd8c54cdd8c78b 100755 (executable)
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -66,7 +66,7 @@ test_expect_success 'revert forbidden on dirty working tree' '
        echo content >extra_file &&
        git add extra_file &&
        test_must_fail git revert HEAD 2>errors &&
-       grep "Dirty index" errors
+       grep "Your local changes would be overwritten by " errors
 
 '