Merge updated git-gui and gitk that call each other