Add sample conflicts file

Browse Source

This is already referenced in the manual.

pull/713/head^2

Wilfred Hughes 2024-05-14 10:13:50 +07:00

parent a259c858a1

commit a9bcee7733

1 changed files with 1711 additions and 0 deletions

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

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

1711

sample_files/conflicts.el vendored

View File

File diff suppressed because it is too large Load Diff