diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-07 08:29:35 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-07 08:32:33 +0100 |
| commit | 44760f1d559ae2087e53be6971ad4f1a8f18f1d7 (patch) | |
| tree | 14e7e66d6c04bef067999ade2d0e3ee01495975d /diff-files.c | |
| parent | Refactored merge options into separate merge-options.txt. (diff) | |
| download | git-44760f1d559ae2087e53be6971ad4f1a8f18f1d7.tar.xz git-44760f1d559ae2087e53be6971ad4f1a8f18f1d7.zip | |
Documentation: talk about guts of merge in tutorial.
While discussing Jon's ASCII art on merge operations with him, I
realized that the tutorial stops talking about the plumbing
details halfway. So fill in the gory details, and update the
examples to use 'git-merge', not 'git-resolve'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff-files.c')
0 files changed, 0 insertions, 0 deletions