Added images for merge conflicts

Browse Source

...

This commit is contained in:

Gokul Subramonian

2025-09-11 10:14:19 +05:30

parent 9657a1ec1c

commit c87ff0ff92

5 changed files with 19 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

git log graph oneline after merge conflict.png Normal file

Binary file not shown.

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