diff options
| author | Mike JS. Choi <mkchoi212@icloud.com> | 2018-01-04 07:13:51 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 07:13:51 -0600 |
| commit | 22848cc6fec797ef6f174f662169e129b7876e15 (patch) | |
| tree | 93ba7a8e33919d7978a36b749668ee5996539b8a | |
| parent | c51bfb57cd5c71f5a3f1c432e864d9b51d239210 (diff) | |
| parent | 9f03977722a75fddd68adc5346b87707d22a64ff (diff) | |
Merge pull request #19 from xyproto/emoji
Add missing emoji
| -rw-r--r-- | README.md | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -27,7 +27,7 @@ brew tap mkchoi212/fac https://github.com/mkchoi212/fac.git brew install fac
```
-## Using
+## 🔧 Using
`fac` operates much like `git add -p` . It has a prompt input at the bottom of the screen where the user inputs various commands.
@@ -42,9 +42,9 @@ d - use incoming version j - scroll down
k - scroll up
-v - [v]iew orientation
+v - [v]iew orientation
n - [n]ext conflict
-p - [p]revious conflict
+p - [p]revious conflict
h | ? - [h]elp
q | Ctrl+c - [q]uit
@@ -54,7 +54,7 @@ q | Ctrl+c - [q]uit -> The movement controls have been derived from both the world of gamers (WASD) and VIM users (HJKL).
+> The movement controls have been derived from both the world of gamers (WASD) and VIM users (HJKL).
## ✋ Contributing
|