akkartik/sokoban.love - Change 67PWAM7GNOQ7VPRXZAMYR62OG7IMEBEBCSE2ARUCZHWG7IZO5MMAC

resolve conflicts

Created by akkartik 2 days ago

67PWAM7GNOQ7VPRXZAMYR62OG7IMEBEBCSE2ARUCZHWG7IZO5MMAC

Dependencies

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua
BFD:BFD[4.2] → [5.147125:147164]
BFD:BFD[4.2] → [5.147125:147164]
BFD:BFD[5.147164] → [5.83786:83786]
B:BD[5.106063] → [3.12:82]
B:BD[7.22256] → [3.83:153]
∅:D[3.153] → [5.106152:106180]
∅:D[3.82] → [5.106093:106123]
```
  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

BFD:BFD[4.2] → [5.165788:165827]

BFD:BFD[5.165827] → [5.152503:152503]

B:BD[8.455] → [3.158:192]

B:BD[7.25659] → [3.193:388]

B:BD[5.159233] → [3.389:420]

B:BD[5.160465] → [3.421:452]

B:BD[5.160579] → [3.453:484]

B:BD[9.9684] → [3.485:516]

B:BD[5.160800] → [3.517:548]

B:BD[5.161374] → [3.549:580]

B:BD[5.161892] → [3.581:612]

B:BD[9.9773] → [3.613:644]

B:BD[5.162009] → [3.645:676]

B:BD[5.162287] → [3.677:708]

∅:D[3.708] → [5.162423:162650]

∅:D[3.676] → [10.229:291]

∅:D[3.644] → [5.161921:161971]

∅:D[3.612] → [11.194:233]

∅:D[3.580] → [5.161510:161688]

∅:D[3.548] → [5.160936:161115]

∅:D[3.516] → [5.160722:160800]

∅:D[3.484] → [9.9553:9684]

∅:D[3.452] → [5.160494:160579]

∅:D[3.420] → [5.159262:159317]

∅:D[3.388] → [10.173:228]

∅:D[3.192] → [7.25356:25659]

  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

BFD:BFD[4.2] → [5.177715:177749]

BFD:BFD[5.177749] → [5.165829:165829]

B:BD[13.425] → [3.710:734]

∅:D[3.734] → [13.450:680]

  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

BFD:BFD[4.2] → [5.183867:183898]

BFD:BFD[5.183898] → [5.178107:178107]

B:BD[13.1916] → [3.739:763]

∅:D[3.763] → [13.1973:2214]

  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

Insertion in main.lua at line 22 [16.2]
[14.2189]
[15.23433]
```
  OS = love.system.getOS()
```
Deletion in main.lua at line 27 [16.2]
B:BD[14.2321] → [17.133:133]
∅:D[18.105] → [18.105:106]
∅:D[17.133] → [18.105:106]
B:BD[18.105] → [18.105:106]
B:BD[19.611] → [3.767:794]
BD:BD[19.611] → [3.767:794]
BD:BD[19.611] → [3.767:794]
```
  OS = love.system.getOS()
```
Resurrecting zombie bytes in main.lua at line 27 [16.2]
B:B[3.794] → [3.794:795]
BD:B[3.794] → [3.794:795]
BD:B[3.794] → [3.794:795]
Replacement in main.lua at line 132 [16.2]
B:BD[20.220] → [20.220:277]
```
  local os = love.system.getOS()
  if os == 'Linux' then
```
[20.220]
[20.277]
```
  if OS == 'Linux' then
```
Deletion in main.lua at line 276 [16.2]
B:BD[21.155] → [3.797:797]
BD:BD[21.155] → [3.797:797]

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source_text.lua, source_text.lua

File deletion: source_edit.lua, source_edit.lua

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

Insertion in main.lua at line 22 [16.2]

Deletion in main.lua at line 27 [16.2]

Resurrecting zombie bytes in main.lua at line 27 [16.2]

Replacement in main.lua at line 132 [16.2]

Deletion in main.lua at line 276 [16.2]