mergetools / gvimdiffon commit transport-helper.c: do not overwrite forced bit (cf31f70)
   1. "$MERGE_TOOLS_DIR/vimdiff"