245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
|
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
|
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
|
set ::diff($top,mergeFile) $apa
}
}
set ch [open $::diff($top,mergeFile) "w"]
puts -nonewline $ch [$w get 1.0 end-1char]
close $ch
# Detect if this is a GIT merge, and possibly add it to the index
# after save (i.e. git add file)
if {[detectRevSystem $::diff($top,mergeFile)] eq "GIT"} {
set apa [tk_messageBox -parent $top.merge -icon info -type yesno \
-title "Diff" \
-message "Saved merge to file $::diff($top,mergeFile).\nAdd\
it to GIT index?"]
if {$apa eq "yes"} {
eskil::rev::GIT::add $::diff($top,mergeFile)
}
} else {
tk_messageBox -parent $top.merge -icon info -type ok -title "Diff" \
-message "Saved merge to file $::diff($top,mergeFile)."
tk_messageBox -parent $top.merge -icon info -type ok -title "Diff" \
-message "Saved merge to file $::diff($top,mergeFile)."
}
}
# Close merge window and clean up.
proc closeMerge {top} {
global diff
destroy $top.merge
|