X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6023-merge-file.sh;h=7dcf39191476f272431e19e10ebb299d6aa55bb1;hb=c32056e0ef193002f80d75fd795e156ddf65c4ab;hp=f8942bc8908fb92b1b11580e3554a81377dc3ba1;hpb=4258c212ca2c3674be4b7e00a19db705eee77a48;p=git.git

diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index f8942bc89..7dcf39191 100755
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -54,6 +54,12 @@ deduxit me super semitas jusitiae,
 EOF
 printf "propter nomen suum." >> new4.txt
 
+test_expect_success 'merge with no changes' '
+	cp orig.txt test.txt &&
+	git merge-file test.txt orig.txt orig.txt &&
+	test_cmp test.txt orig.txt
+'
+
 cp new1.txt test.txt
 test_expect_success "merge without conflict" \
 	"git merge-file test.txt orig.txt new2.txt"