/tests-clar/merge/

• ../
• .trivial.c.swp
• fastforward.c
• merge_helpers.c
• merge_helpers.h
• modeconflict.c
• setup.c
• simple.c
• trivial.c