Merge branch 'maint'
* maint: git-merge: document the -S option
Junio C Hamano committed
Oct 18, 2013 at 13:53 UTC
82c41a9bfc843aa2a6e286bcb917b0436714ebd4
No changes.
* maint: git-merge: document the -S option
No changes.