Great blog post, which I should definetly try out sometime…Or it should even be a mandatory hook script!

http://andialbrecht.wordpress.com/2009/05/09/when-merging-fails/

Source/Kaynak : http://blogs.sun.com/intheclouds/entry/how_do_you_look_when