diff options
| author | Santi Béjar <sbejar@gmail.com> | 2007-03-05 09:09:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-05 00:27:37 -0800 |
| commit | ac3ec0d5558ed6805e55d5b18bd8ee893fda9065 (patch) | |
| tree | 5fda821d47066afcb6b2086a9d039e6cab498a12 /t/t5515/fetch.master_.._.git_one_two | |
| parent | Post 1.5.0.3 cleanup (diff) | |
| download | git-ac3ec0d5558ed6805e55d5b18bd8ee893fda9065.tar.gz git-ac3ec0d5558ed6805e55d5b18bd8ee893fda9065.zip | |
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.master_.._.git_one_two')
| -rw-r--r-- | t/t5515/fetch.master_.._.git_one_two | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t5515/fetch.master_.._.git_one_two b/t/t5515/fetch.master_.._.git_one_two new file mode 100644 index 0000000000..35ec5782c8 --- /dev/null +++ b/t/t5515/fetch.master_.._.git_one_two @@ -0,0 +1,3 @@ +# master ../.git one two +8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ +6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../ |