lstebner / unconflict.me

this is a tool to help resolve file merge conflicts

unconflict.me

unconflict.me is a tool to help with merging file conflicts. Check it out, use it, give feedback!