Use diff3 conflicts.
[~madcoder/dotfiles.git] / config / terminfo /
drwxr-xr-x   ..
drwxr-xr-x - r