pijul nest
guest › [sign in] [explore]

resolve conflicts

akkartik
Nov 12, 2025, 7:15 PM
67PWAM7GNOQ7VPRXZAMYR62OG7IMEBEBCSE2ARUCZHWG7IZO5MMAC

Dependencies

Change contents

  • file deletion: source_text.lua (----------)source_text.lua (----------)
    [4.2]→[4.147125:147164](∅→∅),[4.2]→[4.147125:147164](∅→∅),[4.147164]→[4.83786:83786](∅→∅)
    elseif chord == 'home' or (OS == 'OS X' and chord == 's-left') then
    elseif chord == 'end' or (OS == 'OS X' and chord == 's-right') then
    Text.end_of_line(State)
    Text.start_of_line(State)
  • file deletion: source_edit.lua (----------)source_edit.lua (----------)
    [4.2]→[4.165788:165827](∅→∅),[4.2]→[4.165788:165827](∅→∅),[4.165827]→[4.152503:152503](∅→∅)
    local dm = App.default_modifier
    chord ~= dm('a') and chord ~= dm('c') and chord ~= dm('x') and chord ~= 'backspace' and chord ~= 'delete' and chord ~= dm('z') and chord ~= dm('y') and not App.is_cursor_movement(key) then
    elseif chord == dm('f') then
    elseif chord == dm('=') then
    elseif chord == dm('-') then
    elseif chord == dm('0') then
    elseif chord == dm('z') then
    elseif chord == dm('y') then
    elseif chord == dm('a') then
    elseif chord == dm('c') then
    elseif chord == dm('x') then
    elseif chord == dm('v') then
    -- We don't have a good sense of when to scroll, so we'll be conservative
    -- and sometimes scroll when we didn't quite need to.
    local before_line = State.cursor1.line
    local before = snapshot(State, before_line)
    local s = Text.cut_selection_and_record_undo_event(State)
    local s = Text.selection(State)
    if s then
    State.selection1 = {line=1, pos=1}
    local event = redo_event(State)
    if event then
    local src = event.after
    State.screen_top1 = deepcopy(src.screen_top)
    State.cursor1 = deepcopy(src.cursor)
    local event = undo_event(State)
    if event then
    local src = event.before
    State.screen_top1 = deepcopy(src.screen_top)
    State.cursor1 = deepcopy(src.cursor)
    edit.update_font_settings(State, 20)
    Text.redraw_all(State)
    -- undo
    if State.font_height > 2 then
    edit.update_font_settings(State, State.font_height-2)
    Text.redraw_all(State)
    end
    edit.update_font_settings(State, State.font_height+2)
    Text.redraw_all(State)
    State.search_term = ''
    State.search_backup = {
    Text.delete_selection_and_record_undo_event(State)
    if State.selection1.line and
    not State.lines.current_drawing and
    -- printable character created using shift key => delete selection
    -- (we're not creating any ctrl-shift- or alt-shift- combinations using regular/printable keys)
    (not App.shift_down() or utf8.len(key) == 1) and
  • file deletion: source.lua (----------)source.lua (----------)
    [4.2]→[4.177715:177749](∅→∅),[4.2]→[4.177715:177749](∅→∅),[4.177749]→[4.165829:165829](∅→∅)
    if OS == 'Linux' then
    -- love.window.setPosition doesn't quite seem to do what is asked of it on Linux.
    App.screen.move(settings.x, settings.y-37, settings.displayindex)
    else
    App.screen.move(settings.x, settings.y, settings.displayindex)
  • file deletion: run.lua (----------)run.lua (----------)
    [4.2]→[4.183867:183898](∅→∅),[4.2]→[4.183867:183898](∅→∅),[4.183898]→[4.178107:178107](∅→∅)
    if OS == 'Linux' then
    -- love.window.setPosition doesn't quite seem to do what is asked of it on Linux.
    App.screen.move(settings.x, settings.y-37, settings.displayindex)
    else
    App.screen.move(settings.x, settings.y, settings.displayindex)
    end
    end
  • edit in main.lua at line 22
    [4.2189]
    [4.23433]
    OS = love.system.getOS()
  • edit in main.lua at line 27
    [4.2321]→[4.133:133](∅→∅),[4.105]→[4.105:106](∅→∅),[4.133]→[4.105:106](∅→∅),[4.105]→[4.105:106](∅→∅),[4.611]→[3.767:794](∅→∅),[4.611]→[3.767:794](∅→∅),[4.611]→[3.767:794](∅→∅)
    OS = love.system.getOS()
  • resurrect zombie in main.lua at line 27
    [3.794]→[3.794:795](∅→∅),[3.794]→[3.794:795](∅→∅),[3.794]→[3.794:795](∅→∅)
  • replacement in main.lua at line 132
    [4.220]→[4.220:277](∅→∅)
    local os = love.system.getOS()
    if os == 'Linux' then
    [4.220]
    [4.277]
    if OS == 'Linux' then
  • edit in main.lua at line 276
    [4.155]→[3.797:797](∅→∅),[4.155]→[3.797:797](∅→∅)