Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file src/merge.tcl at check-in ef2a6449e0fe3420
|
2024-09-08
| ||
| 20:52 | Rebuilt main menus to psmenu. Changed psmenu to use options. Removed experiemental filter from debug. file: [903527c5b4] check-in: [6bf27462d4] user: peter branch: trunk, size: 24796 | |
| 00:55 | Added psmenu package. Use it for merge dialog. file: [fbeda94b54] check-in: [88bd8ecfdb] user: peter branch: trunk, size: 24798 | |
|
2019-11-10
| ||
| 17:28 | Cleanup file: [24707b74ed] check-in: [f02d0c04f1] user: peter branch: trunk, size: 25540 | |
| 16:29 | Cleanup file: [e0bd9287da] check-in: [46064856af] user: peter branch: trunk, size: 25524 | |
|
2019-09-13
| ||
| 00:02 | Display tabs better in merge window file: [48455935b0] check-in: [2a703e5e70] user: peter branch: trunk, size: 25489 | |
|
2016-09-04
| ||
| 21:37 | Preserve line endings when saving during Edit Mode. file: [c466523ed6] check-in: [c9caad7929] user: peter branch: trunk, size: 25465 | |
|
2015-03-06
| ||
| 01:17 | Mac support file: [92667ce063] check-in: [8d2623486a] user: peter branch: trunk, size: 25670 | |
|
2015-02-22
| ||
| 23:46 | Code polish to silence syntax warnings. file: [2f9e87f9c4] check-in: [63cd9c7aa2] user: peter branch: trunk, size: 25660 | |
|
2012-08-30
| ||
| 20:42 | Corrected display of ancestor lines in three-way merge. file: [1e1c28333b] check-in: [e64e1eb72f] user: peter branch: trunk, size: 25658 | |
|
2012-02-19
| ||
| 22:33 | Improvements to 3-way merge. file: [b5d93e4e59] check-in: [2795132d5b] user: peter branch: trunk, size: 25553 | |
| 20:03 | Corrected merge conflict navigation file: [0fc0a302c9] check-in: [800cc3cd25] user: peter branch: trunk, size: 23360 | |
|
2011-05-27
| ||
| 06:09 | Cleanup of global variable usage. file: [251ba7ec03] check-in: [ef2a6449e0] user: peter.spjuth@gmail.com branch: trunk, size: 23259 | |
|
2011-04-29
| ||
| 23:53 | Improved three-way merge file: [484d079db4] check-in: [2f126fd631] user: peter.spjuth@gmail.com branch: trunk, size: 23092 | |
|
2011-04-25
| ||
| 15:58 | 3-way diff now handles basic cases. file: [eb40c655f8] check-in: [674c783efa] user: peter.spjuth@gmail.com branch: trunk, size: 19015 | |
| 14:28 | Added infrastructure for ancestor file file: [d8d739fda7] check-in: [cc9aa5b84c] user: peter.spjuth@gmail.com branch: trunk, size: 15381 | |
|
2011-04-22
| ||
| 00:10 | Merging did not work properly if alignement was used. [Bug 9925] file: [aa2ccbd89a] check-in: [20eadc24c4] user: peter.spjuth@gmail.com branch: trunk, size: 14823 | |
|
2011-04-03
| ||
| 21:55 | Include file name in merge window title file: [10f453ec22] check-in: [6ef49cc3ff] user: peter.spjuth@gmail.com branch: trunk, size: 14019 | |
|
2010-11-07
| ||
| 18:37 | Autodetect line endings in conflict file. Allow line ending selection in merge save. [FR 5160] Added menu bar to merge window. file: [d32d6eb99f] check-in: [5995a4b5f7] user: peter.spjuth@gmail.com branch: table-list, size: 14001 | |
|
2010-04-27
| ||
| 19:29 | Do git add after conflict merge of a git file. file: [458c178f54] check-in: [02a22eea17] user: peter branch: trunk, size: 12221 | |
|
2009-02-12
| ||
| 19:11 | More 8.5 features used: lassign instead of foreach. lrepeat+lreverse Math commands for some expressions. file: [08c9600628] check-in: [ace521ad0a] user: peter branch: trunk, size: 11709 | |
| 18:31 | Require 8.5. Use argument expansion instead of eval. file: [b8dba19426] check-in: [eaa675fac3] user: peter branch: trunk, size: 11717 | |
|
2008-02-21
| ||
| 06:38 | Updated email address file: [82d917dbfd] check-in: [803932a2c1] user: peter branch: trunk, size: 11724 | |
|
2008-02-20
| ||
| 20:50 | Adapting more to Tile file: [ffc21523d5] check-in: [9e3510e827] user: peter branch: trunk, size: 11723 | |
|
2007-01-10
| ||
| 21:02 | Added: Moved merge to separate source file. file: [f6daec4027] check-in: [d3a7f91085] user: peter branch: trunk, size: 11659 | |