main diff merge git code example

Example: git merge diff

Just store diff into a patch file, edit patch if needed and apply patch:
git diff commitid1 commitid2 > file.patch #edit diff to merge in file
git apply file.patch	#Apply diff of patch file into current branch