102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
}
# Fill up the merge window with the initial version of merged files.
proc fillMergeWindow {top} {
global eskil
set w $top.merge.t
$w delete 1.0 end
set marks {}
set t 0
set firstConflict -1
foreach {commLeft diffLeft} $eskil($top,leftMergeData) \
{commRight diffRight} $eskil($top,rightMergeData) {
$w insert end $commRight
|
>
|
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
}
# Fill up the merge window with the initial version of merged files.
proc fillMergeWindow {top} {
global eskil
set w $top.merge.t
##nagelfar vartype w _obj,text
$w delete 1.0 end
set marks {}
set t 0
set firstConflict -1
foreach {commLeft diffLeft} $eskil($top,leftMergeData) \
{commRight diffRight} $eskil($top,rightMergeData) {
$w insert end $commRight
|