diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2009-10-09 13:51:14 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-10-09 14:43:04 -0700 |
commit | 25dcc0d64b9f3c11abcd0f53a9b9cdb6092ed646 (patch) | |
tree | 63b60797ace5c81b6cf44a7f1ae0338c2dc8885d /diffcore-pickaxe.c | |
parent | Documentation: git fmt-merge-msg does not have to be a script (diff) | |
download | tgif-25dcc0d64b9f3c11abcd0f53a9b9cdb6092ed646.tar.xz |
Documentation: clarify mergeoptions description
Sounds better this way, at least to my ears. ("The syntax and
supported options of git merge" is a plural noun. "the same"
instead of "equal" sounds less technical and seems to convey
the meaning better here.)
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions