projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: f887564)
Use git-merge instead of git-resolve in git-pull.
authorJunio C Hamano <junkio@cox.net>
Sat, 17 Sep 2005 06:38:59 +0000 (23:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Sep 2005 01:16:27 +0000 (18:16 -0700)
Signed-off-by: Junio C Hamano <junkio@cox.net>

No differences found
The core git plumbing