summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-unconfig_.._.git_one
diff options
context:
space:
mode:
authorSanti Béjar <sbejar@gmail.com>2007-03-05 09:09:39 +0100
committerJunio C Hamano <junkio@cox.net>2007-03-05 00:27:37 -0800
commitac3ec0d5558ed6805e55d5b18bd8ee893fda9065 (patch)
tree5fda821d47066afcb6b2086a9d039e6cab498a12 /t/t5515/fetch.br-unconfig_.._.git_one
parent46d49472f4d49d13ea77179cd072fc1234985eed (diff)
downloadgit-ac3ec0d5558ed6805e55d5b18bd8ee893fda9065.tar.gz
t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch
Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t5515/fetch.br-unconfig_.._.git_one')
-rw-r--r--t/t5515/fetch.br-unconfig_.._.git_one2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t5515/fetch.br-unconfig_.._.git_one b/t/t5515/fetch.br-unconfig_.._.git_one
new file mode 100644
index 0000000000..11eb5a6ef2
--- /dev/null
+++ b/t/t5515/fetch.br-unconfig_.._.git_one
@@ -0,0 +1,2 @@
+# br-unconfig ../.git one
+8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../