Update git-merge documentation.
authorJakub Narebski <jnareb@gmail.com>
Thu, 12 Jul 2007 23:54:06 +0000 (01:54 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Jul 2007 03:20:49 +0000 (20:20 -0700)
commitdbddb71...b0e69ef15fba64e74f34244ab95f0610
tree75d0cd4...a5e2b5fd2c1ab2a913bdbcc51302a76ecopy hash to clipboard (tree)
parent7d7baa5...15b9ad6768d782d9bae5badc4e51d4eacopy hash to clipboard (diff)
Documentation/config.txt
Documentation/git-merge.txt
Documentation/git.txt