http://gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html
ʂ̃TCgɃWv悤ƂĂ܂BXΏL̃NNbNĂ
UPLIFTōLȂő̌܂傤IKȉ{Ct܂I