Documentation/merge-options.txt: order options in alphabetical groups
authorJari Aalto <jari.aalto@cante.net>
Thu, 22 Oct 2009 19:25:20 +0000 (22:25 +0300)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Oct 2009 19:39:18 +0000 (12:39 -0700)
commit7c85d27429784c181ca633fb1465a9c651dbce8a
tree5b7e2cbdd1f96c48ae875c6ccdd2db85c6fe9b52
parent3f7a9b5ad128151e6eb0b45266779e63e4b2287a
Documentation/merge-options.txt: order options in alphabetical groups

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-options.txt