0bc409dab9
The original command line syntax for "git merge", which was "git merge <msg> HEAD <parent>...", has been deprecated for quite some time, and "git gui" was the last in-tree user of the syntax. This is finally fixed, so that we can move forward with the deprecation. * rs/git-gui-use-modern-git-merge-syntax: git-gui: stop using deprecated merge syntax |
||
|---|---|---|
| .. | ||
| about.tcl | ||
| blame.tcl | ||
| branch.tcl | ||
| branch_checkout.tcl | ||
| branch_create.tcl | ||
| branch_delete.tcl | ||
| branch_rename.tcl | ||
| browser.tcl | ||
| checkout_op.tcl | ||
| choose_font.tcl | ||
| choose_repository.tcl | ||
| choose_rev.tcl | ||
| class.tcl | ||
| commit.tcl | ||
| console.tcl | ||
| database.tcl | ||
| date.tcl | ||
| diff.tcl | ||
| encoding.tcl | ||
| error.tcl | ||
| git-gui.ico | ||
| index.tcl | ||
| line.tcl | ||
| logo.tcl | ||
| merge.tcl | ||
| mergetool.tcl | ||
| option.tcl | ||
| remote.tcl | ||
| remote_add.tcl | ||
| remote_branch_delete.tcl | ||
| search.tcl | ||
| shortcut.tcl | ||
| spellcheck.tcl | ||
| sshkey.tcl | ||
| status_bar.tcl | ||
| themed.tcl | ||
| tools.tcl | ||
| tools_dlg.tcl | ||
| transport.tcl | ||
| win32.tcl | ||
| win32_shortcut.js | ||