diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-21 14:01:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-21 14:01:56 -0700 |
| commit | acfadcfb48e34fdc441e9cffbb385fce9693b363 (patch) | |
| tree | 2aaafd05b4c530754840d6065ea840261fc7c751 /git-resolve.sh | |
| parent | b91fb518cc5c5f316ba149ceedff5ee194f44ebf (diff) | |
| download | git-acfadcfb48e34fdc441e9cffbb385fce9693b363.tar.gz | |
Revert "Use git-merge instead of git-resolve in git-pull."
This reverts f887564ab72e107bcdee3ba83c91e2bb4ae13ca7 commit.
Diffstat (limited to 'git-resolve.sh')
0 files changed, 0 insertions, 0 deletions