merge: teach -Xours/-Xtheirs to symbolic link merge

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index b1673b3e8f38d9961b8b2783e1f5c47a865638fb..093832fef1541906b735d162a76c8ffa773d236c 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -68,6 +68,13 @@ test_expect_success 'blame 1 author' '
        check_count A 2
 '
 
+test_expect_success 'blame by tag objects' '
+       git tag -m "test tag" testTag &&
+       git tag -m "test tag #2" testTag2 testTag &&
+       check_count -h testTag A 2 &&
+       check_count -h testTag2 A 2
+'
+
 test_expect_success 'setup B lines' '
        echo "2A quick brown fox jumps over the" >>file &&
        echo "lazy dog" >>file &&