merge-strategies: avoid implying that "-s theirs" exists
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: c25d98b2a730cbc63033ba3360df2519d43a40cd)
-rw-r--r-- 2158 Makefile
-rwxr-xr-x 348800 gitk
drwxr-xr-x - po