Documentation: clarify mergeoptions description
authorJonathan Nieder <jrnieder@gmail.com>
Fri, 9 Oct 2009 18:51:14 +0000 (13:51 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Oct 2009 21:43:04 +0000 (14:43 -0700)
commit25dcc0d...4b9f3c11abcd0f53a9b9cdb6092ed646
tree63b6079...ace5c81b6cf44a7f1ae0338c2dc8885dcopy hash to clipboard (tree)
parent0f8a02c...40397ce22080e1c2eaa5029388638589copy hash to clipboard (diff)
Documentation/config.txt
Documentation/git-merge.txt