Differences From Artifact [d32d6eb99f]:
- File src/merge.tcl — part of check-in [5995a4b5f7] at 2010-11-07 18:37:51 on branch table-list — Autodetect line endings in conflict file. Allow line ending selection in merge save. [FR 5160] Added menu bar to merge window. (user: peter.spjuth@gmail.com size: 14001) [more...]
To Artifact [10f453ec22]:
- File src/merge.tcl — part of check-in [6ef49cc3ff] at 2011-04-03 21:55:52 on branch trunk — Include file name in merge window title (user: peter.spjuth@gmail.com size: 14019)
︙ | |||
293 294 295 296 297 298 299 | 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 | - + | set w $top.merge if {![winfo exists $w]} { toplevel $w } else { destroy {*}[winfo children $w] } |
︙ |