diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-11-04 13:29:38 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-04 13:29:38 +0900 |
| commit | ab6b50e4c8339167c0b048c778055526226c45ca (patch) | |
| tree | f378953158b99acafc700cff190ee31b0f964593 /ll-merge.c | |
| parent | Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po (diff) | |
| parent | Merge branch 'ka/japanese-translation' (diff) | |
| download | tgif-ab6b50e4c8339167c0b048c778055526226c45ca.tar.xz | |
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
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions