mergetools / gvimdiffon commit contrib/subtree: Add a test for subtree rebase that loses commits (5f35900)
   1. "$MERGE_TOOLS_DIR/vimdiff"