100644 blob e6394a9e8fa60b1fd20fa76c76318c36985c8a74	conflict_data.h
100644 blob daa73fadaa438ffa9580a059a73973531fbef66e	files.c
100644 blob 4b1b7d2621763e831216783b53b7565fe7ada169	merge_helpers.c
100644 blob e407c7d138fb457674c3b114fcf47748169ab0c5	merge_helpers.h
040000 tree 1e7eb1f768b198abba94a0892427c444a314a84d	trees
040000 tree 921b7e0e6e26da0b83f1aceb27d68626e3197a30	workdir