Hey,
Would be useful if the merge conflict window also showed the commit number it's having problems merging (or even handier, if it had a link to open a log window with that commit). A lot of the conflicts I get when I'm doing big merges (100+ commits) I'm having check the log window in the background to figure out which commit it's getting stuck on, which I'm then opening up in a separate log to check the changes on their own before dealing with the conflict.
Just showing the number here in the conflict window would help me and others out a lot, especially since I'm leaving notes for how I've dealt with the conflicts.
Cheers,
Kieren