Merge diff in gitk