Feature request: standalone Xcode 4.x mergetool

Number:rdar://12917808 Date Originated:20-Dec-2012
Status:Open Resolved:No
Product:Developer Tools (Xcode) Product Version:4.x
Classification:Feature request Reproducible:N/A
Xcode 4.x features the best conflict resolution tool that I have every used. It's clearest UI and its inline editing capabilities make solving git-pull conflicts a piece of cake.

I would like to submit a feature request for a standalone mergetool with the feature-set of Xcode 4.x merge component that shows when there is a conflict.

I would like to be able to use this tool from the Terminal by invoking 'git mergetool'. This would be very useful for complex merge, rebase or cherry-picking operations that are not directly supported within Xcode.

See this question I submitted to apple.stackexchange for additional information:
- http://apple.stackexchange.com/questions/22392/how-to-use-xcode-4-mergetool-in-a-standalone-fashion

Thank you.


Please note: Reports posted here will not necessarily be seen by Apple. All problems should be submitted at bugreport.apple.com before they are posted here. Please only post information for Radars that you have filed yourself, and please do not include Apple confidential information in your posts. Thank you!