t / test9200a.pngon commit Teach git-pull to pass -X<option> to git-merge (ee2c795)
t/test9200a.png