It was a bit sad since we use scripts to do the merge, then we can check the conflict list in the log message, and assign to separate owners to resolve them. Would it be possible to make it as an config option? On Tue, Jul 7, 2015 at 12:08 AM, Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> wrote: > Andrey Hsiao <andreyhsiao@xxxxxxxxx> writes: > >> Dear list: >> >> In the past, when we do the merge in git, if conflicts occurred, >> when we commit, the conflict list will be appended to >> the default commit message automatically. >> >> eg: >> Conflicts: >> ....a.java >> ....b.java >> >> Today, after using Git 2.3.0 for a merge, it seems now the conflict list >> was commented out by default. > > Yes, this changed here: > > https://github.com/git/git/commit/261f315bebfa9af2d09f20211960100ff06f87cb > > -- > Matthieu Moy > http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html