git notes merge: Manual conflict resolution, part 2/2
[git] / gitweb /
drwxr-xr-x   ..
-rw-r--r-- 10626 INSTALL
-rw-r--r-- 4498 Makefile
-rw-r--r-- 22110 README
-rwxr-xr-x 210996 gitweb.perl
drwxr-xr-x - static