X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6023-merge-file.sh;h=d9f343942c7eb9d1e80e98db2252cb29135544fa;hb=208247adb9fc3702f87c6ec3fc26bd85d10d73e6;hp=d486d73994cf563063b578ec5e212331e87bf67f;hpb=f62e53c897c359b5885c474c41341d83845a78f6;p=git.git

diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index d486d7399..d9f343942 100755
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -64,6 +64,14 @@ cp new1.txt test.txt
 test_expect_success "merge without conflict" \
 	"git merge-file test.txt orig.txt new2.txt"
 
+test_expect_success 'works in subdirectory' '
+	mkdir dir &&
+	cp new1.txt dir/a.txt &&
+	cp orig.txt dir/o.txt &&
+	cp new2.txt dir/b.txt &&
+	( cd dir && git merge-file a.txt o.txt b.txt )
+'
+
 cp new1.txt test.txt
 test_expect_success "merge without conflict (--quiet)" \
 	"git merge-file --quiet test.txt orig.txt new2.txt"