screenshots: PR #2164

Browse Source

...

This commit is contained in:

Thomas Petersen

2026-07-20 13:28:09 +02:00

parent 66e43cccee

commit 62319e1658

2 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

pr-2164--01-merge-conflict.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 24 KiB

BIN

pr-2164--02-merge-conflict-prepared.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 36 KiB