mergetools / gvimdiff2on commit diff: let "git diff -O" read orderfile from any file and fail properly (a21bae3)
   1. "$MERGE_TOOLS_DIR/vimdiff"