tree f378953158b99acafc700cff190ee31b0f964593
parent 93bf7423dd21c9d7bf2fd99c97cbfcb74740eac3
parent b524f6b399c77b40c8bf2b6217585fde4731472a
author Junio C Hamano <gitster@pobox.com> 1572841778 +0900
committer Junio C Hamano <gitster@pobox.com> 1572841778 +0900

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

* https://github.com/prati0100/git-gui:
  git-gui: improve Japanese translation
  git-gui: add a readme
  git-gui: support for diff3 conflict style
  git-gui: use existing interface to query a path's attribute
  git-gui (Windows): use git-bash.exe if it is available
  treewide: correct several "up-to-date" to "up to date"
  Fix build with core.autocrlf=true