Skip to content

Commit c9fddf0

Browse files
committed
Update readme
1 parent a13fdf3 commit c9fddf0

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ Terminal Git mergetool with a 3-way TUI and Neovim integration
44

55
[![codecov](https://codecov.io/gh/chojs23/ec/graph/badge.svg?token=AX5BFUF8YN)](https://codecov.io/gh/chojs23/ec)
66

7-
<img width="1613" height="848" alt="ec 3 pane terminal merge conflict resolver" src="https://github.com/user-attachments/assets/f6903327-15c6-4fc0-9427-5bd820ba02ec" />
7+
<img width="1613" height="848" alt="ec 3-way terminal git mergetool" src="https://github.com/user-attachments/assets/f6903327-15c6-4fc0-9427-5bd820ba02ec" />
88

99
![ec demo resolving git merge conflicts in terminal](https://github.com/user-attachments/assets/7c3eba19-d72b-499b-b2e8-3e16f645407e)
1010

11+
> With Lazygit
12+
> ![ec with lazygit](https://github.com/user-attachments/assets/debd1426-5259-47d2-aa83-def364746f3f)
13+
1114
ec (easy-conflict) is a 3-way terminal native Git merge conflict resolver. Supports diff3 base comparison, and helps you resolve merge conflicts faster without leaving the terminal.
1215

1316
## Features
@@ -196,7 +199,7 @@ Float option notes:
196199
- `zindex`: float stacking order.
197200

198201
</details>
199-
202+
https://github.com/user-attachments/assets/debd1426-5259-47d2-aa83-def364746f3f
200203
### Commands
201204

202205
```

0 commit comments

Comments
 (0)