0. [[Vimdiff with git|13.1.-Vimdiff-with-git]]
0. [[vimdiff two files|13.2.-vimdiff-two-files]]