mergetools / gvimdiff3on commit merge: remove drop_save() in favor of remove_merge_branch_state() (b643355)
   1. "$MERGE_TOOLS_DIR/vimdiff"