Browser: add 'c' command to accept a conflict.
[wiggle/upstream.git] / demo.patched / 
tree51ac91bb876f5f63176887192a4681ec6b66ab04
drwxr-xr-x   ..
-rw-r--r-- 1584 Makefile
-rw-r--r-- 1840 README
-rw-r--r-- 13489 vpatch.c
-rw-r--r-- 16064 wiggle.c