Fossil SCM
Omit the tearoff from the 2-way diff menu on the merge-info app.
Commit
f9648f89467aac115dffa45ca588a387f5f22ce27ace42e11bfd298b83762529
Parent
0aceaa3b277861a…
1 file changed
+2
-2
+2
-2
| --- src/merge.tcl | ||
| +++ src/merge.tcl | ||
| @@ -346,12 +346,12 @@ | ||
| 346 | 346 | bind . <$key> "scroll-$axis $args; break" |
| 347 | 347 | bind . <Shift-$key> continue |
| 348 | 348 | } |
| 349 | 349 | |
| 350 | 350 | frame .bb |
| 351 | -::ttk::menubutton .bb.diff2 -text {2-way diffs} -menu .bb.diff2.m | |
| 352 | -menu .bb.diff2.m | |
| 351 | +::ttk::menubutton .bb.diff2 -text {2-way diff} -menu .bb.diff2.m | |
| 352 | +menu .bb.diff2.m -tearoff 0 | |
| 353 | 353 | .bb.diff2.m add command -label {baseline vs. local} -command {two-way 12} |
| 354 | 354 | .bb.diff2.m add command -label {baseline vs. merge-in} -command {two-way 13} |
| 355 | 355 | .bb.diff2.m add command -label {local vs. merge-in} -command {two-way 23} |
| 356 | 356 | |
| 357 | 357 | # Bring up a separate two-way diff between a pair of columns |
| 358 | 358 |
| --- src/merge.tcl | |
| +++ src/merge.tcl | |
| @@ -346,12 +346,12 @@ | |
| 346 | bind . <$key> "scroll-$axis $args; break" |
| 347 | bind . <Shift-$key> continue |
| 348 | } |
| 349 | |
| 350 | frame .bb |
| 351 | ::ttk::menubutton .bb.diff2 -text {2-way diffs} -menu .bb.diff2.m |
| 352 | menu .bb.diff2.m |
| 353 | .bb.diff2.m add command -label {baseline vs. local} -command {two-way 12} |
| 354 | .bb.diff2.m add command -label {baseline vs. merge-in} -command {two-way 13} |
| 355 | .bb.diff2.m add command -label {local vs. merge-in} -command {two-way 23} |
| 356 | |
| 357 | # Bring up a separate two-way diff between a pair of columns |
| 358 |
| --- src/merge.tcl | |
| +++ src/merge.tcl | |
| @@ -346,12 +346,12 @@ | |
| 346 | bind . <$key> "scroll-$axis $args; break" |
| 347 | bind . <Shift-$key> continue |
| 348 | } |
| 349 | |
| 350 | frame .bb |
| 351 | ::ttk::menubutton .bb.diff2 -text {2-way diff} -menu .bb.diff2.m |
| 352 | menu .bb.diff2.m -tearoff 0 |
| 353 | .bb.diff2.m add command -label {baseline vs. local} -command {two-way 12} |
| 354 | .bb.diff2.m add command -label {baseline vs. merge-in} -command {two-way 13} |
| 355 | .bb.diff2.m add command -label {local vs. merge-in} -command {two-way 23} |
| 356 | |
| 357 | # Bring up a separate two-way diff between a pair of columns |
| 358 |