sequencer: rename reset_for_rollback to reset_merge
[gitweb.git] / negotiator /
drwxr-xr-x   parent (dest: ; base: 918d1e6ed89738afad63a5cfc92668ac77a7be95)
-rw-r--r-- 4258 default.c
-rw-r--r-- 160 default.h
-rw-r--r-- 6011 skipping.c
-rw-r--r-- 163 skipping.h