A tool to automatically resolve Git conflicts that occur in Xcode project files
#21: apply_change_to_project: Fix adding subproject that already exist. #22: kintusgi.rb: Add missing import. #24: apply_change_to_project: Support adding aggregate target.
#16: apply_change_to_project: Fix removal of simple value that's nil already. #17: kintsugi.rb: Don't reset Git file state after resolving conflicts. #18: Kintsugi: Support Git merge driver
#11: README.md: Mention that Kintsugi can be used only in 3-way merge. #10: bin/kintsugi: Add version and copyright information.