Merge branch 'mg/maint-difftool-vim-readonly'

diff --git a/t/t4013/diff.diff_--name-status_dir2_dir b/t/t4013/diff.diff_--name-status_dir2_dir
index ef7fdb73356ad95f62412055c7d8c6b64758308d..d0d96aaa91eec7f5a6cb833e43bbd3ec89efad98 100644 (file)
--- a/t/t4013/diff.diff_--name-status_dir2_dir
+++ b/t/t4013/diff.diff_--name-status_dir2_dir
@@ -1,3 +1,2 @@
 $ git diff --name-status dir2 dir
-A      dir/sub
 $