mergetools / gvimdiffon commit git-common-dir: make "modules/" per-working-directory directory (df56607)
   1. "$MERGE_TOOLS_DIR/vimdiff"