Skip to content

Commit bf2b2e8

Browse files
committed
Update installation README
1 parent d31361b commit bf2b2e8

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

README.md

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,45 @@ easy-conflict is a terminal native Git mergetool with a 3 pane IntelliJ like res
1818

1919
## Install
2020

21-
Option 1. Go install
21+
### Homebrew
22+
23+
```
24+
brew install chojs23/ec/ec
25+
```
26+
27+
### Go install
2228

2329
```
2430
go install github.com/chojs23/ec/cmd/ec@latest
2531
```
2632

27-
Option 2. Install script
33+
### Install script
2834

2935
Downloads the GitHub release binary. VERSION is optional and defaults to latest.
3036

3137
```
3238
./scripts/install.sh
39+
```
40+
41+
```
3342
VERSION=v0.1.3 PREFIX=/usr/local ./scripts/install.sh
3443
```
3544

36-
Option 3. Build from source
45+
### Build from source
3746

3847
```
3948
make build
4049
```
4150

42-
Option 4. AUR (build from source)
51+
### AUR
52+
53+
- build from source
4354

4455
```
4556
pikaur -S easy-conflict
4657
```
4758

48-
Option 5. AUR (binary)
59+
- binary
4960

5061
```
5162
pikaur -S easy-conflict-bin
@@ -56,13 +67,17 @@ pikaur -S easy-conflict-bin
5667
1. Run with no args inside a git repo that has conflicts
5768

5869
```
70+
5971
ec
72+
6073
```
6174

6275
2. Use it as a mergetool
6376

6477
```
78+
6579
git mergetool --tool ec
80+
6681
```
6782

6883
## Neovim plugin (terminal buffer)
@@ -146,14 +161,12 @@ Usage:
146161
Add this to your git config
147162

148163
```
149-
150164
[merge]
151165
tool = ec
152166
153167
[mergetool "ec"]
154168
cmd = ec "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
155169
trustExitCode = true
156-
157170
```
158171

159172
Notes
@@ -166,30 +179,23 @@ Notes
166179
Interactive
167180

168181
```
169-
170182
ec <BASE> <LOCAL> <REMOTE> <MERGED>
171183
ec --base <path> --local <path> --remote <path> --merged <path>
172-
173184
```
174185

175186
No args mode
176187

177188
```
178-
179189
ec
180-
181190
```
182191

183192
Non interactive
184193

185194
```
186-
187195
ec --check --merged <path>
188196
ec --apply-all ours --base <path> --local <path> --remote <path> --merged <path>
189-
190197
```
191198

192-
193199
## Resolver screen
194200

195201
The resolver shows three panes in one view.

0 commit comments

Comments
 (0)