Hi, Jonathan Nieder writes: > 2. The change is from > > fatal: 'commit' is not possible because you have unmerged files. > Please, fix them up in the work tree ... > ... etc, etc ... > > to > > error: 'commit' is not ... > error: Please, fix them up... > ... etc, etc ... > fatal: Exiting because of an unresolved conflict. > Notice that after writing the above, a little detail jumps out: > namely, the second "error:" line is giving advice, so it might make > sense to make it say "hint:" instead. How do I do this correctly? Changing the "return error" statement to "fprintf(stderr, "hint: Please fix them up ...")" doesn't feel right. --- Ram -- 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