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