Merge branch 'js/merge-edit-option'
* js/merge-edit-option: Documentation: fix formatting error in merge-options.txt
Junio C Hamano committed
Dec 5, 2011 at 11:15 UTC
eb3b8d7658331f4ec5f115d7407393d845644f5e
No changes.
* js/merge-edit-option: Documentation: fix formatting error in merge-options.txt
No changes.