![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 8 Nov 2005 06:50:57 +0000 (22:50 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 8 Nov 2005 08:23:12 +0000 (00:23 -0800) | ||
| commit | 067744bd5dc23540745788b5aa11d4e9dea1ceef | |
| tree | 2058c03a324f06aff5d506574e55658da4c730ac | tree | snapshot |
| parent | fb612d54c1df7e45d174060c1cbdf060accceb6d | commit | diff |
Tutorial: do not use 'git resolve'.
Use 'git merge' instead.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Use 'git merge' instead.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/tutorial.txt | diff | blob | history |