Deconflicter > Commit [abd8cea]

Christian Lee Seibold

Sat March 15, 2025 9:30 PM -0500

Initial


 .gitignore           |    6 ++++++
 build.bat            |  198 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 example3.c           |  105 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 example_conflict.c   |   97 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 linux_debug          |   10 ++++++++++
 linux_release        |   11 +++++++++++
 src/colors.c         |  190 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/conflicter.h     |  350 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/hashmap.c        |  132 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main.c           | 1308 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/parsing.c        |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/stretchybuffer.c |  117 +++++++++++++++++++++++++++++++++++++++++++++++++++++

Commit Hash: abd8cea19f93083089eac62a57744fafef87695c

Tree Hash: a99b17e0fdadcd46bce3992eb922733fcc457325

Date: 2025-03-15T21:30:12-05:00

Browse Tree
Commits
Repo Home