Merge branch 'lp/typofixes'

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index a85fc7d42ceb796289fd3d6332d63f6dc69d134d..1a080e782371e2d7ad489c706a54fce1553b9579 100755 (executable)
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -536,6 +536,16 @@ test_expect_success 'multiple identical conflicts' '
        test_cmp file1.expect file1 &&
        test_cmp file2.expect file2 &&
 
+       # Forget resolution for file2
+       git rerere forget file2 &&
+       echo file2 >expect &&
+       git rerere status >actual &&
+       test_cmp expect actual &&
+       count_pre_post 2 1 &&
+
+       # file2 already has correct resolution, so record it again
+       git rerere &&
+
        # Pretend that the resolutions are old again
        find .git/rr-cache/ -type f | xargs test-chmtime -172800 &&