Diff Between Git Pull And Merge