rerere: recalculate conflict ID when unresolved conflict is committed
[gitweb.git] / contrib / persistent-https /
drwxr-xr-x   parent (dest: contrib; base: bd7dfa543e0263858071b8648a55ef7ccae1085b)
-rw-r--r-- 11358 LICENSE
-rw-r--r-- 1500 Makefile
-rw-r--r-- 1989 README
-rw-r--r-- 4937 client.go
-rw-r--r-- 2424 main.go
-rw-r--r-- 4786 proxy.go
-rw-r--r-- 2917 socket.go