diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-07 22:50:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-08 00:23:12 -0800 |
| commit | 067744bd5dc23540745788b5aa11d4e9dea1ceef (patch) | |
| tree | 2058c03a324f06aff5d506574e55658da4c730ac /config.c | |
| parent | fb612d54c1df7e45d174060c1cbdf060accceb6d (diff) | |
| download | git-067744bd5dc23540745788b5aa11d4e9dea1ceef.tar.gz git-067744bd5dc23540745788b5aa11d4e9dea1ceef.tar.xz | |
Tutorial: do not use 'git resolve'.
Use 'git merge' instead.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'config.c')
0 files changed, 0 insertions, 0 deletions