Documentation: talk about guts of merge in tutorial.
authorJunio C Hamano <junkio@cox.net>
Mon, 7 Nov 2005 07:29:35 +0000 (23:29 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 7 Nov 2005 07:32:33 +0000 (23:32 -0800)
commit44760f1...559ae2087e53be6971ad4f1a8f18f1d7
tree14e7e66...6c04bef067999ade2d0e3ee01495975dcopy hash to clipboard (tree)
parent93d69d8...912c44206543f6670e93f9fc6f2f859fcopy hash to clipboard (diff)
Documentation/tutorial.txt