use 3way merge for git-am

Signed-off-by: MORITA Kazutaka <morita.kazutaka@gmail.com>