diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-17 10:38:59 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-21 05:16:27 +0400 |
| commit | f887564ab72e107bcdee3ba83c91e2bb4ae13ca7 (patch) | |
| tree | eae844ac1f369bf699f35150e6f3808a4180e55e /git-fetch.sh | |
| parent | 27cfe2e2dcbfc4f6c6288ed4eafd077e232c2ab1 (diff) | |
Use git-merge instead of git-resolve in git-pull.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-fetch.sh')
0 files changed, 0 insertions, 0 deletions