provide more errors for the "merge into empty head" case
[git] / gitk-git /
drwxr-xr-x   ..
-rw-r--r-- 1771 Makefile
-rw-r--r-- 274458 gitk
drwxr-xr-x - po