Improve language in git-merge.txt and related docs
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Tue, 9 Dec 2008 06:23:51 +0000 (07:23 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Dec 2008 04:57:52 +0000 (20:57 -0800)
commit29b802a...e6213d02879d21aabac1a8d2e035b583
tree341c1ef...b55daaca255cd58a11386ebdeb9b3d7fcopy hash to clipboard (tree)
parent9c0c1b1...28e27bf4ac8a7b13f0b0ed3eaebc8cffcopy hash to clipboard (diff)
Documentation/git-fast-export.txt
Documentation/git-merge-base.txt
Documentation/git-merge-file.txt
Documentation/git-merge-index.txt
Documentation/git-merge-tree.txt
Documentation/git-merge.txt
Documentation/git-mergetool.txt
Documentation/merge-config.txt
Documentation/merge-options.txt