$ git mergetool
Opens FileMerge.
Then just keep tapping the down/left/right keys to choose changes.
Opens FileMerge.
Then just keep tapping the down/left/right keys to choose changes.
Another thing we've done to keep the insanity down is break our monolithic project into a few library projects to keep the project file merge damage to a minimum.