Documentation: Describe merge operation a bit better.
authorJunio C Hamano <junkio@cox.net>
Tue, 29 Nov 2005 06:54:30 +0000 (22:54 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 29 Nov 2005 06:54:30 +0000 (22:54 -0800)
commitffb1a4b...d55534e276a0e4fc7dc1c94d17be8579
tree1559dc4...d94b88ef584966842cbddeed08e7a256copy hash to clipboard (tree)
parent3e2f62b...bfe8e9aeea63849c37c65f25ea001e65copy hash to clipboard (diff)
Documentation/git-merge.txt