mergetools / gvimdiff2on commit Merge branch 'kb/am-deprecate-resolved' (4b9a0de)
   1. "$MERGE_TOOLS_DIR/vimdiff"