Skip to content

Tags: chojs23/ec

Tags

v0.4.2

Toggle v0.4.2's commit message
Focus the diff view when Enter is pressed

v0.4.1

Toggle v0.4.1's commit message
bump npm

v0.3.3

Toggle v0.3.3's commit message
harden git conflict discovery

v0.3.2

Toggle v0.3.2's commit message

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Merge pull request #31 from chojs23/fix/diff3

Apply classifyConflictOutput relaxation

v0.3.1

Toggle v0.3.1's commit message

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Merge pull request #28 from chojs23/fix/merge-style-conflict

Preserve canonical base label when importing merge-style conflicts

v0.3.0

Toggle v0.3.0's commit message

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Merge pull request #22 from chojs23/feat/nix

chore: Add a first-party Nix flake

v0.2.3

Toggle v0.2.3's commit message

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Merge pull request #9 from chojs23/allow-missing-base

Fix missing base chunk error when empty diff3 base with stage 1

v0.2.2

Toggle v0.2.2's commit message
Support windows

v0.2.1

Toggle v0.2.1's commit message
Add codecov.yml

v0.2.0

Toggle v0.2.0's commit message
update changelog for v0.2.0