#Emacs and #magit users, have you figured out a way to tweak merge conflict/diff views so that the versions have more meaningful names?
E.g. merging foo into master, showing labels like "changes to be applied from foo" and "base from master" would be amazing.