This posting [ http://git-blame.blogspot.com/2012/02/anticipating-git-1710.html ] describes a change in behaviour when doing interactive git merge for git 1.7.10.
Quote: Most merges do cleanly resolve, and this behavior resulted in people making their merges *too* easily and lightly, even when the reason why the merge was made in the first place *should* be explained. Nobody explained why the merge was made in a merge commit, because in order to do so after git mergealready made the commit, they have to go back and run git commit --amend to do so. Recently in a discussion on the Git mailing list<http://thread.gmane.org/gmane.linux.kernel/1191100/focus=181362>, Linus admitted (and I agreed) that this was one of the design mistakes we made early in the history of Git. And in 1.7.10 and later, the git merge command that is run in an interactive session (i.e. both its standard input and its standard output connected to a terminal) will open an editor before creating a commit to record the merge result, to give the user a chance to explain the merge, just like the git commit command the user runs after resolving a conflicted merge already does. End Quote: Would this change require modifications to magit? Regards, Kam-Yung
