File tree Expand file tree Collapse file tree 1 file changed +16
-14
lines changed
Expand file tree Collapse file tree 1 file changed +16
-14
lines changed Original file line number Diff line number Diff 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```
2430go install github.com/chojs23/ec/cmd/ec@latest
2531```
2632
27- Option 2. Install script
33+ ### Install script
2834
2935Downloads the GitHub release binary. VERSION is optional and defaults to latest.
3036
3137```
3238./scripts/install.sh
39+ ```
40+
41+ ```
3342VERSION=v0.1.3 PREFIX=/usr/local ./scripts/install.sh
3443```
3544
36- Option 3. Build from source
45+ ### Build from source
3746
3847```
3948make build
4049```
4150
42- Option 4. AUR (build from source)
51+ ### AUR
52+
53+ - build from source
4354
4455```
4556pikaur -S easy-conflict
4657```
4758
48- Option 5. AUR ( binary)
59+ - binary
4960
5061```
5162pikaur -S easy-conflict-bin
@@ -146,14 +157,12 @@ Usage:
146157Add this to your git config
147158
148159```
149-
150160[merge]
151161 tool = ec
152162
153163[mergetool "ec"]
154164 cmd = ec "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
155165 trustExitCode = true
156-
157166```
158167
159168Notes
@@ -166,30 +175,23 @@ Notes
166175Interactive
167176
168177```
169-
170178ec <BASE> <LOCAL> <REMOTE> <MERGED>
171179ec --base <path> --local <path> --remote <path> --merged <path>
172-
173180```
174181
175182No args mode
176183
177184```
178-
179185ec
180-
181186```
182187
183188Non interactive
184189
185190```
186-
187191ec --check --merged <path>
188192ec --apply-all ours --base <path> --local <path> --remote <path> --merged <path>
189-
190193```
191194
192-
193195## Resolver screen
194196
195197The resolver shows three panes in one view.
You can’t perform that action at this time.
0 commit comments