diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-25 20:42:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-25 20:42:41 (GMT) |
| commit | 90dbf226ba3fae0d932ae4e42d8d3122a47766bc (patch) | |
| tree | 142b78726092609973fe9b2d5055fe9aa85de3fc /git-merge-octopus.sh | |
| parent | 5800c63717ae35286a1441f14ffff753e01f7e2b (diff) | |
| parent | 492595cfc70f97cd99d4c460db1ba01b73dab932 (diff) | |
| download | git-90dbf226ba3fae0d932ae4e42d8d3122a47766bc.zip git-90dbf226ba3fae0d932ae4e42d8d3122a47766bc.tar.gz git-90dbf226ba3fae0d932ae4e42d8d3122a47766bc.tar.bz2 | |
Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows
* 'js/msgfmt-on-windows' of ../git-gui:
git-gui (MinGW): make use of MSys2's msgfmt
git gui: allow for a long recentrepo list
git gui: de-dup selected repo from recentrepo history
git gui: cope with duplicates in _get_recentrepo
git-gui: remove duplicate entries from .gitconfig's gui.recentrepo
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions