Merge branch 'fc/advice-diverged-history'
[git/gitster.git] / Documentation / mergetools / 
treeff9e06cd4236dd8d695dd08bdeaa150dc119feae
drwxr-xr-x   ..
-rw-r--r-- 6946 vimdiff.txt