author | Santi Béjar <sbejar@gmail.com> | |
Sat, 23 Sep 2006 20:55:35 +0000 (22:55 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sun, 24 Sep 2006 09:00:21 +0000 (02:00 -0700) | ||
commit | 6cc7c36d5e2fd89be596a164bcc2afede9d855d3 | |
tree | 4cb22bf44c322bd027ca06a8e7a575c070b8cbbb | tree | snapshot |
parent | 5372806a849cf117596b1f7c8c7d512c519f8092 | commit | diff |
Add test for the default merges in fetch.
[jc: with minor fix-ups]
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
[jc: with minor fix-ups]
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
t/t5510-fetch.sh | diff | blob | history |