Skip to content

Commit

Permalink
Update README about diff3 support
Browse files Browse the repository at this point in the history
Parsing diff3 is hard yo
  • Loading branch information
mkchoi212 authored Jan 6, 2018
1 parent 7d8c39e commit 0e9722c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ brew install fac

## 🔧 Using

> **Please note fac does NOT support diff3 merge conflict outputs yet!**
`fac` operates much like `git add -p` . It has a prompt input at the bottom of the screen where the user inputs various commands.

The commands have been preset to the following specifications
Expand All @@ -52,8 +54,6 @@ q | Ctrl+c - [q]uit
[w,a,s,d,?] >> [INPUT HERE]
```



> The movement controls have been derived from both the world of gamers (WASD) and VIM users (HJKL).
## ✋ Contributing
Expand Down

0 comments on commit 0e9722c

Please sign in to comment.