mergetools / gvimdiff2on commit dir.c: git-ls-files --directories: don't hide empty directories (184d2a8)
   1. "$MERGE_TOOLS_DIR/vimdiff"