Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Apr 2010 01:21:29 +0000 (18:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Apr 2010 01:21:29 +0000 (18:21 -0700)
commita6018bbdca918c4f0a35badcfd826077d07502ca
tree14bf0bcbea0095e15cadf5d514296a2be1b2e793
parent4553d58f374c6bfcae6b4be528bbf11c18a7efe5
parentf78683f3a85ca16ae16e1180703d3280b272f45d
Merge branch 'maint'

* maint:
  Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
  Docs: Add -X option to git-merge's synopsis.

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