From e9e90cd90417b460d3450d589f65681d325cde1b Mon Sep 17 00:00:00 2001 From: shilangyu Date: Wed, 22 May 2019 19:55:55 +0200 Subject: prettified the markdown keybinds --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 4f6cd5a..0ac845c 100644 --- a/README.md +++ b/README.md @@ -43,23 +43,22 @@ brew install fac The commands have been preset to the following specifications -``` -w - show more lines up -s - show more lines down -a - use local version -d - use incoming version -e - manually edit code - -j - scroll down -k - scroll up - -v - [v]iew orientation -n - [n]ext conflict -p - [p]revious conflict - -h | ? - [h]elp -q | Ctrl+c - [q]uit +| Keybinding | Description | +| ------------------------------- | -------------------- | +| w | show more lines up | +| s | show more lines down | +| a | use local version | +| d | use incoming version | +| e | manually edit code | +| j | scroll down | +| k | scroll up | +| v | [v]iew orientation | +| n | [n]ext conflict | +| p | [p]revious conflict | +| h, ? | [h]elp | +| q, Ctrl+c | [q]uit | +``` [w,a,s,d,?] >> [INPUT HERE] ``` @@ -77,4 +76,5 @@ This is an open source project so feel free to contribute by - Or [tweet](https://twitter.com/Bananamlkshake2) at me! ## 👮 License + See [License](./LICENSE) -- cgit v1.2.3