akkartik/wardley.love - Change 3CZRJ62SHHEKNJVO246BWREJBPM7N6R23CNRIDLT5EADXTGCBEQAC

resolve conflicts

Created by akkartik on October 28, 2023

3CZRJ62SHHEKNJVO246BWREJBPM7N6R23CNRIDLT5EADXTGCBEQAC

Dependencies

In channels

main

Change contents

File deletion: run.lua, run.lua
BFD:BFD[6.2] → [7.184046:184077]
BFD:BFD[6.2] → [7.184046:184077]
BFD:BFD[7.184077] → [7.178044:178044]
B:BD[8.193] → [4.17:50]
∅:D[4.50] → [8.289:314]
```
    return App.current_dir..path
  end
  return path
end
```

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[6.2] → [7.203223:203262]

BFD:BFD[7.203262] → [7.191782:191782]

B:BD[7.193544] → [5.0:46]

B:BD[7.193682] → [5.47:108]

B:BD[7.193902] → [5.109:218]

∅:D[5.218] → [7.194012:194585]

∅:D[5.108] → [7.193746:193902]

∅:D[5.46] → [7.193590:193682]

      elseif line.data:match('%[ u250c') then
        local section_name = line.data:match('u250c%s*(.*)')
      elseif line.data:match('%] u2518') then
        local section_name = line.data:match('] u2518%s*(.*)')
        if array.find(Section_stack, function(x) return x.name == section_name end) then
          while table.remove(Section_stack).name ~= section_name do
            --
          end
          line.section_end = true
          line.section_name = section_name
          line.data = nil
        end
        line.section_stack = table.shallowcopy(Section_stack)
      else
        -- string
        line.section_stack = table.shallowcopy(Section_stack)
      end
    else
      line.section_stack = {}
    end
  end
end
function table.shallowcopy(x)
  return {unpack(x)}
        table.insert(Section_stack, {name=section_name})
        line.section_begin = true
        line.section_name = section_name
        line.data = nil
        line.section_stack = table.shallowcopy(Section_stack)  -- as it is at the beginning

File deletion: log.lua, log.lua

BFD:BFD[6.2] → [7.204116:204147]

BFD:BFD[7.204147] → [7.203264:203264]

B:BD[7.203712] → [5.219:356]

B:BD[7.203866] → [5.357:494]

∅:D[5.494] → [7.203911:204096]

∅:D[5.356] → [7.203757:203866]

	-- I'd like to use the unicode character \u{250c} here, but it doesn't work
	-- in OpenBSD.
	log(stack_frame_index, '[ u250c ' .. name)
	-- I'd like to use the unicode character \u{2518} here, but it doesn't work
	-- in OpenBSD.
	log(stack_frame_index, '] u2518 ' .. name)
end
function log_new(name, stack_frame_index)
	if stack_frame_index == nil then
		stack_frame_index = 4
	end
	log_end(name, stack_frame_index)
	log_start(name, stack_frame_index)
end
end
function log_end(name, stack_frame_index)
	if stack_frame_index == nil then
		stack_frame_index = 3
	end

Replacement in run.lua at line 166 [11.178107]

B:BD[10.193] → [10.193:289]

    return love.filesystem.getWorkingDirectory()..'/'..path  -- '/' should work even on Windows

[10.193]

[10.289]

    return App.current_dir..path

Replacement in log_browser.lua at line 45 [11.191243]
B:BD[11.193005] → [11.193005:193051]
```
      elseif line.data:match('\u{250c}') then
```
[11.193005]
[11.193051]
```
      elseif line.data:match('%[ u250c') then
```

Replacement in log_browser.lua at line 47 [11.191243]

B:BD[11.193143] → [11.193143:193207]

        local section_name = line.data:match('\u{250c}%s*(.*)')

[11.193143]

[11.193207]

        local section_name = line.data:match('u250c%s*(.*)')

Replacement in log_browser.lua at line 52 [11.191243]

B:BD[11.193363] → [11.193363:193473]

      elseif line.data:match('\u{2518}') then
        local section_name = line.data:match('\u{2518}%s*(.*)')

[11.193363]

[11.193473]

      elseif line.data:match('%] u2518') then
        local section_name = line.data:match('] u2518%s*(.*)')

Replacement in log.lua at line 17 [11.202725]

B:BD[11.203173] → [11.203173:203218]

	log(stack_frame_index, '\u{250c} ' .. name)

[11.203173]

[11.203218]

	-- I'd like to use the unicode character \u{250c} here, but it doesn't work
	-- in OpenBSD.
	log(stack_frame_index, '[ u250c ' .. name)

Replacement in log.lua at line 25 [11.202725]

B:BD[11.203327] → [11.203327:203372]

	log(stack_frame_index, '\u{2518} ' .. name)

[11.203327]

[11.203372]

	-- I'd like to use the unicode character \u{2518} here, but it doesn't work
	-- in OpenBSD.
	log(stack_frame_index, '] u2518 ' .. name)