On Mon, Nov 26, 2012 at 3:03 PM, Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> wrote: > Your initial message was about the output of "git log". Do you mean that > the file, on the filesystem, does not have the line introduced by the > commit? Yes, sorry if I was not clear enough. > If so, check the content registered in the repository too: > > git show <merge-commit>:<file-name> Content shown is identical to the one in working copy, ie., it is missing one line change. git annotate <file> <merge commit> - shows that particular line as if it has originated from when the file was originally added to repo. git annotate <file> <merge commit>^2 - shows line as being modified by a commit done after file was added - ie., state I would expect after a merge -- 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