Merge branch 'fr_v2.39_rnd1' of github.com:jnavila/git
[alt-git.git] / Documentation / mergetools / 
treeff9e06cd4236dd8d695dd08bdeaa150dc119feae
drwxr-xr-x   ..
-rw-r--r-- 6946 vimdiff.txt