3 Commits (aeb2aaa7712f7af8237d5bceb725a7db8c2d4620)

Author SHA1 Message Date
Jared Hance ce14e0b264 Convert "! git" to "test_must_fail git" 15 years ago
Avery Pennarun ee2c79552a Teach git-pull to pass -X<option> to git-merge 15 years ago
Avery Pennarun 8cc5b29065 git merge -X<option> 15 years ago