mergetools / gvimdiff2on commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1. "$MERGE_TOOLS_DIR/vimdiff"