mergetools / gvimdiffon commit Merge branch 'rs/checkout-some-states-are-const' (48e1f8e)
   1. "$MERGE_TOOLS_DIR/vimdiff"