Merge https://github.com/j6t/git-gui

* https://github.com/j6t/git-gui:
  git-gui: fix inability to quit after closing another instance
  git-gui: sv.po: Update Swedish translation (576t0f0u)
  git-gui: note the new maintainer
  Makefile(s): do not enforce "all indents must be done with tab"
  Makefile(s): avoid recipe prefix in conditional statements
  doc: switch links to https
  doc: update links to current pages
  git-gui: po: fix typo in French "aperçu"

Author: gitster

git-gui/README.md

@@ -42,8 +42,8 @@ You probably need to have root/admin permissions to install.
 
 # Contributing
 
-The project is currently maintained by Pratyush Yadav over at
-https://github.com/prati0100/git-gui. Even though the project is hosted at
+The project is currently maintained by Johannes Sixt at
+https://github.com/j6t/git-gui. Even though the project is hosted at
 GitHub, the development does not happen over GitHub Issues and Pull Requests.
 Instead, an email based workflow is used. The Git mailing list
 [[email protected]](mailto:[email protected]) is where the patches are

git-gui/git-gui.sh

@@ -2301,7 +2301,7 @@ proc do_quit {{rc {1}}} {
 		#
 		set save [gitdir GITGUI_MSG]
 		if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
-			file rename -force [gitdir GITGUI_BCK] $save
+			catch { file rename -force [gitdir GITGUI_BCK] $save }
 			set GITGUI_BCK_exists 0
 		} elseif {[$ui_comm edit modified]} {
 			set msg [string trim [$ui_comm get 0.0 end]]

git-gui/po/fr.po

@@ -1646,7 +1646,7 @@ msgstr "Dépôt Git (sous projet)"
 
 #: lib/diff.tcl:222
 msgid "* Binary file (not showing content)."
-msgstr "* Fichier binaire (pas d'apperçu du contenu)."
+msgstr "* Fichier binaire (pas d'aperçu du contenu)."
 
 #: lib/diff.tcl:227
 #, tcl-format