Git merge with opendiff