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)
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found