Skip to content

Commit

Permalink
Merge pull request #19 from xyproto/emoji
Browse files Browse the repository at this point in the history
Add missing emoji
  • Loading branch information
mkchoi212 authored Jan 4, 2018
2 parents c51bfb5 + 9f03977 commit 22848cc
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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
Expand All @@ -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

Expand Down

0 comments on commit 22848cc

Please sign in to comment.