Junio C Hamano ff65e796f0 Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax ...

* 'rs/use-modern-git-merge-syntax' of git-gui:
  git-gui: stop using deprecated merge syntax

2016-09-26 07:16:48 -07:00

..

about.tcl

…

blame.tcl

…

branch_checkout.tcl

…

branch_create.tcl

…

branch_delete.tcl

…

branch_rename.tcl

…

branch.tcl

…

browser.tcl

…

checkout_op.tcl

…

choose_font.tcl

…

choose_repository.tcl

Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui

2015-04-18 18:35:48 -07:00

choose_rev.tcl

…

class.tcl

…

commit.tcl

…

console.tcl

…

database.tcl

…

date.tcl

…

diff.tcl

Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui

2015-04-18 18:35:48 -07:00

encoding.tcl

…

error.tcl

…

git-gui.ico

…

index.tcl

…

line.tcl

…

logo.tcl

…

merge.tcl

Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax

2016-09-26 07:16:48 -07:00

mergetool.tcl

…

option.tcl

Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui

2015-04-18 18:35:48 -07:00

remote_add.tcl

…

remote_branch_delete.tcl

…

remote.tcl

…

search.tcl

…

shortcut.tcl

…

spellcheck.tcl

…

sshkey.tcl

…

status_bar.tcl

…

themed.tcl

…

tools_dlg.tcl

…

tools.tcl

…

transport.tcl

…

win32_shortcut.js

…

win32.tcl

…