101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
}
test gui-1.1 {Run 3-way merge} -setup {
set f1 [tcltest::makeFile {} _test1]
} -body {
RestartClient -fine -a tests/ancestor.txt tests/left.txt tests/right.txt -o $f1
tktest::waitFocus press Save
tktest::waitFocus press No
tktest::press Close
catch {exec diff $f1 tests/merge.txt}
} -cleanup {
tcltest::removeFile {} _test1
} -result {0}
catch {tktest::menu File Quit}
|
|
|
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
}
test gui-1.1 {Run 3-way merge} -setup {
set f1 [tcltest::makeFile {} _test1]
} -body {
RestartClient -fine -a tests/ancestor.txt tests/left.txt tests/right.txt -o $f1
tktest::waitFocus press Save
tktest::waitFocus press Ok
tktest::press Close
catch {exec diff $f1 tests/merge.txt}
} -cleanup {
tcltest::removeFile {} _test1
} -result {0}
catch {tktest::menu File Quit}
|