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
Junio C Hamano committed
Apr 13, 2010 at 18:21 UTC
a6018bbdca918c4f0a35badcfd826077d07502ca
No changes.