A tool for resolving conflicts easily.
Build the project in xcode and copy "conflict" and "cf" to an system path.
Before using the tool, you must set "git config --global merge.conflictstyle diff3".
When conflict occurs, use "cf" command and follow the prompt.