Docs: Made resolving merge conflicts a local file

Browse Source

...

This commit is contained in:

Glenn Vriesman

2018-08-18 12:53:26 +02:00

parent fd01cdb137

commit 7b85d146af

2 changed files with 2 additions and 2 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

docs/resources/resolving-merge-conflicts.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 MiB