checkout.txt: note about losing staged changes with --merge
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"