![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 21 Sep 2005 21:01:56 +0000 (14:01 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 21 Sep 2005 21:01:56 +0000 (14:01 -0700) | ||
| commit | acfadcfb48e34fdc441e9cffbb385fce9693b363 | |
| tree | 2aaafd05b4c530754840d6065ea840261fc7c751 | tree | snapshot |
| parent | b91fb518cc5c5f316ba149ceedff5ee194f44ebf | commit | diff |
Revert "Use git-merge instead of git-resolve in git-pull."
This reverts f887564ab72e107bcdee3ba83c91e2bb4ae13ca7 commit.
This reverts f887564ab72e107bcdee3ba83c91e2bb4ae13ca7 commit.
| git-pull.sh | diff | blob | history |