bash completion: only show 'log --merge' if merging
[gitweb.git] / contrib / difftool /
drwxr-xr-x   parent (dest: contrib; base: bf3c20f6e855521fb92f455a9e70fbe8f107c53d)
-rwxr-xr-x 1475 git-difftool
-rwxr-xr-x 6126 git-difftool-helper
-rw-r--r-- 3188 git-difftool.txt