Commit Graph
6 Commits
Author SHA1 Message Date
ZacharyZhang-NY af061f5737 Git · conflict markers take their width and whole lines; marked, resolve and conflicts share it 2026-10-07 03:37:31 -04:00
ZacharyZhang-NY 829ef681ba Git · ThreeWayMerge draws rows in view with its words in i18n and lines read out; diff3 base sections parse; branch and tag rows pick from the keyboard; shorter comments 2026-10-07 02:36:16 -04:00
ZacharyZhang-NY 99980e413c Panics · P19 Git: a lagging blame draws every line; resolve answers None for a conflict gone 2026-10-06 21:52:25 -04:00
ZacharyZhang-NY b950f3e614 T19 round 2 fixes
- regions read their lines through TextMerge's accessors; conflicts and resolve
  split with similar's tokenize_lines, so a lone return ends a line everywhere
- the merged ending and line breaks know a lone return
- taking both sides separates them only when both hold text
- merge views split rows the same way
2026-09-26 02:28:13 -04:00
ZacharyZhang-NY 75656358cf T19 round 1 fixes
- merges keep each line's ending and the last newline; resolve keeps every other byte
- the split view numbers each side from its own file
- hunk headers come from similar's UnifiedHunkHeader: an empty side starts before its range
- the commit subject counter sits in the input's suffix
- clipped code rows in diffs, merges, blame and review set their line height
- gallery: scripted split view and a long subject
2026-09-26 02:19:11 -04:00
ZacharyZhang-NY 950f17636c T19 Git: diffs unified and split with word marks and folds, three-way merge and conflict resolver, changes list and commit input, commit graph and list, branch selector, branch, tag and stash lists, blame with annotation, file history, pull request card, review thread, diff stat and status badge 2026-09-26 01:59:27 -04:00