summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorGlenn Vriesman <g.vriesman@livetech-systems.com>2018-08-18 12:53:26 +0200
committerGlenn Vriesman <g.vriesman@livetech-systems.com>2018-08-18 12:53:26 +0200
commit7b85d146afbe7d93627fcbd657625b6bb84035d7 (patch)
tree06adf3c52cdbc825f04fd50ee239edab02331717 /README.md
parentfd01cdb13779f71108e04402e197ec10db398c12 (diff)
Docs: Made resolving merge conflicts a local file
Diffstat (limited to 'README.md')
-rw-r--r--README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index d32f6a3cc..b0fd43e4a 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ whichever rc file you're using).
* Basic video tutorial [here](https://www.youtube.com/watch?v=VDXvbHZYeKY).
* List of keybindings
-[here](https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md).
+[here](/docs/Keybindings.md).
## Cool features
* Adding files easily
@@ -101,7 +101,7 @@ whichever rc file you're using).
* Squash down and rename commits
### Resolving merge conflicts
-![Gif](https://image.ibb.co/iyxUTT/shortermerging.gif)
+![Gif](/docs/resources/resolving-merge-conflicts.gif)
### Viewing commit diffs
![Viewing Commit Diffs](https://image.ibb.co/gPD02o/capture.png)