I wish there were more merge extensions in git. For instance, I would very much like an extension that merged bitmap images in a fine-grained manner, such that I could specify if it's okay to merge two sets of changes or just select the latest one on a consistent basis. This would allow multiple devs to do touch-up work on a single large image instead of having to cut it up into pieces.