simplify output of conflicting merge
[git/mingw.git] / contrib / emacs / 
tree60b11dcb7a1b935d3ca9dec3de06327c046c528f
drwxr-xr-x   ..
-rw-r--r-- 6 .gitignore
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 15566 git-blame.el
-rw-r--r-- 69935 git.el