mergetools / gvimdiffon commit Merge branch 'bp/status-rename-config' (5da4847)
   1. "$MERGE_TOOLS_DIR/vimdiff"