Merge with gitk.