Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Work around leftover temporary save file
  gitk: Show diff of commits at end of compare-commits output
  gitk: Update Swedish translation (280t0f0u)

diff --cc gitk-git/gitk
index 8c08310e6dea4aa904b47cd335686deedb6fd5ed,a0214b7004f141b7c918a5360d85f8f9e2db285c..a0214b7004f141b7c918a5360d85f8f9e2db285c
mode 100644,100755..100644
--- 1/gitk-git/gitk
--- 2/gitk
+++ b/gitk-git/gitk

diff --cc gitk-git/po/sv.po
Simple merge