Git Merge Git Diff