mergetools / gvimdiffon commit contrib/subtree: fix broken &&-chains and revealed test error (d417c24)
   1. "$MERGE_TOOLS_DIR/vimdiff"