merge: tidy up isolation of conflicts.
[wiggle/upstream.git] / demo.orig / 
treef3dd84b51da57adcc7730848b3948665ad0d6346
drwxr-xr-x   ..
-rw-r--r-- 1508 Makefile
-rw-r--r-- 1468 README
-rw-r--r-- 13471 vpatch.c
-rw-r--r-- 16064 wiggle.c