From: Jari Aalto <jari.aalto@cante.net>
Date: Thu, 22 Oct 2009 19:25:20 +0000 (+0300)
Subject: Documentation/merge-options.txt: order options in alphabetical groups
X-Git-Tag: v1.6.5.3~14^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7c85d27429784c181ca633fb1465a9c651dbce8a?hp=7c85d27429784c181ca633fb1465a9c651dbce8a

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>
---