関連ワード:  git merge diff between two branches    git merge between two branches    git merge of two branches    git compare between 2 branches  
結果 : git merge diff between two branches