summaryrefslogtreecommitdiff
path: root/ssh-pull.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-13 18:46:43 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-13 18:46:43 (GMT)
commit73319032c8d2b2c73138d5caee1d2838fe1305d2 (patch)
treeb66dab45d46cde41f3d4e365faf03c405d0e6c3f /ssh-pull.c
parent8af12741ee0e35f43b3180b435cd33642c183e97 (diff)
downloadgit-73319032c8d2b2c73138d5caee1d2838fe1305d2.zip
git-73319032c8d2b2c73138d5caee1d2838fe1305d2.tar.gz
git-73319032c8d2b2c73138d5caee1d2838fe1305d2.tar.bz2
git-am: do not fail if 3-way fallback succeeds.
The current one incorrectly stops there without committing. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'ssh-pull.c')
0 files changed, 0 insertions, 0 deletions