/pkg/integration/tests/conflicts/

• ../
• filter.go
• resolve_externally.go
• resolve_multiple_files.go
• undo_choose_hunk.go