diff options
| author | Mike JS. Choi <mkchoi212@icloud.com> | 2018-01-06 12:15:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 12:15:45 -0600 |
| commit | 0e9722c4fe4dab3f701a3c427990eb4eb2deea06 (patch) | |
| tree | ef16b65b61a22e4da25756b946caf7346808aafa | |
| parent | 7d8c39e2cd9d60bf8bc7bc36f58e7250ddaebad5 (diff) | |
Update README about diff3 support
Parsing diff3 is hard yo
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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
@@ -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
|