# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1584519345 -7200
# Node ID aebcb023e71ac1087125aa3fb2bb88bd2285e898
# Parent  ceca880171c387478dcf2843ca268c7ec6573eb2
Show differences to each parent for merge.

diff -r ceca880171c3 -r aebcb023e71a git.rst
--- a/git.rst	Mon Mar 02 20:15:09 2020 +0200
+++ b/git.rst	Wed Mar 18 10:15:45 2020 +0200
@@ -113,8 +113,19 @@
   $ git diff $rev1..$rev2
   $ git diff ORIG_HEAD..HEAD
 
+For merge first parent is a tip where merge is performed, second is a tip of merged branch.
+
+.. note:: ``git show`` shows "combined diff": only files which were modified from all parents.
+          ``git show --first-parent`` can be used to show how branch was chaged after merge.
+
+Show differences to each parent for merge::
+
+  $ git show -m $hash
+
 https://stackoverflow.com/questions/3293607/difference-between-git-head-and-the-current-project-state
   Difference between git HEAD and the current project state?
+https://stackoverflow.com/questions/40986518/git-show-of-a-merge-commit
+  git show of a merge commit.
 
 Undo tracking added file.
 =========================