X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7600-merge.sh;h=fee8fb77d48ef7d4fa08e77f879718d7ab5b1bc0;hb=d6096f17d2d5d9ccb453aabf8edc6ee238b166fc;hp=5eeb6c2b2708d582a6e86cd2e06e2b00b7b7b391;hpb=a0653d550524a0263d36fde6a8cf98941dd057ab;p=git.git

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 5eeb6c2b2..fee8fb77d 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -488,4 +488,14 @@ test_expect_success 'merge c1 with c1 and c2' '
 
 test_debug 'gitk --all'
 
+test_expect_success 'merge fast-forward in a dirty tree' '
+       git reset --hard c0 &&
+       mv file file1 &&
+       cat file1 >file &&
+       rm -f file1 &&
+       git merge c2
+'
+
+test_debug 'gitk --all'
+
 test_done