image diff tool for merge conflicts
Created originally on Bitbucket by fabse
what do you think about an little gui to displays conflicting images during a merge. Instead of just asking the user "use remote or local", both images (if they match common formats lke *.jpg or *gif) could be shown on screen and the user can select which image will be his merge result.
Subversion has a similar tool called ImageDiff (http://tortoisesvn.net/node/324)...
I think the gui seem quite simple, just show both images and let the user select with one klick. Only the binding to merucrial could be some work. Do you think such a screen is possible and can be integrated into a future release of tortoiseHG?