Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Nov 2008 19:11:18 +0000 (11:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Nov 2008 19:11:18 +0000 (11:11 -0800)
commit42fc11c1103a88c49233f04dc0c2f5659b3973fe
treee376a924ff3128ec31582fd988f166cdbfdb9413
parentf20706220ba788a40b6634255215ccb87accca70
parentb0f34c3d6719903e280545e73ae89f6c2ebe533f
Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc

* mm/maint-sort-config-doc:
  config.txt: alphabetize configuration sections

Conflicts:
Documentation/config.txt
Documentation/config.txt
Documentation/merge-config.txt