diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2021-05-31 15:05:15 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2021-05-31 15:05:15 (GMT) |
| commit | b92547b9cbb348cfe8ad4d011d0f3317b620af84 (patch) | |
| tree | 42875044ab674624262633f76c4019e7ac7eb448 /tests/tk.test | |
| parent | dc979fdb12f4eceaf533ea12207bd2f64b2643de (diff) | |
| download | tk-b92547b9cbb348cfe8ad4d011d0f3317b620af84.zip tk-b92547b9cbb348cfe8ad4d011d0f3317b620af84.tar.gz tk-b92547b9cbb348cfe8ad4d011d0f3317b620af84.tar.bz2 | |
Merge trunk, remove additional merge conflicts
Diffstat (limited to 'tests/tk.test')
| -rw-r--r-- | tests/tk.test | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/tk.test b/tests/tk.test index c6f5851..58db73d 100644 --- a/tests/tk.test +++ b/tests/tk.test @@ -10,7 +10,6 @@ eval tcltest::configure $argv tcltest::loadTestedCommands namespace import -force tcltest::test -<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<< testConstraint testprintf [llength [info command testprintf]] testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }] @@ -22,13 +21,6 @@ test tk-1.1 {tk command: general} -body { } -returnCodes error -result {wrong # args: should be "tk subcommand ?arg ...?"} test tk-1.2 {tk command: general} -body { tk xyz -<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<< -} -returnCodes error -result {unknown or ambiguous subcommand "xyz": must be appname, busy, caret, fontchooser, inactive, print, scaling, sysnotify, systray, useinputmethods, or windowingsystem} -======= COMMON ANCESTOR content follows ============================ -} -returnCodes error -result {unknown or ambiguous subcommand "xyz": must be appname, busy, caret, fontchooser, inactive, scaling, useinputmethods, or windowingsystem} -======= MERGED IN content follows ================================== -} -returnCodes error -result {unknown or ambiguous subcommand "xyz": must be appname, busy, caret, fontchooser, inactive, scaling, sysnotify, systray, useinputmethods, or windowingsystem} ->>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # Value stored to restore default settings after 2.* tests set appname [tk appname] |