mergetools / gvimdiff2on commit initial_ref_transaction_commit(): check for ref D/F conflicts (e426ff4)
   1. "$MERGE_TOOLS_DIR/vimdiff"