Igor Lautar <igor.lau...@gmail.com> writes: > Yes, change is shown in commit^2, but actual file after merge does not have > it.
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? If so, check the content registered in the repository too: git show <merge-commit>:<file-name> -- 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
