mergetools / vimdiff3on commit Merge branch 'km/branch-get-push-while-detached' (b85f79c)
   1. "$MERGE_TOOLS_DIR/vimdiff"