Pass empty file to p4merge where no base is suitable.
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 0a0ec7bd66786bcc2204f299f6c993db19d1f53c)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16931 git-blame.el
-rw-r--r-- 69926 git.el