diff options
author | Glenn Vriesman <g.vriesman@livetech-systems.com> | 2018-08-18 12:53:26 +0200 |
---|---|---|
committer | Glenn Vriesman <g.vriesman@livetech-systems.com> | 2018-08-18 12:53:26 +0200 |
commit | 7b85d146afbe7d93627fcbd657625b6bb84035d7 (patch) | |
tree | 06adf3c52cdbc825f04fd50ee239edab02331717 | |
parent | fd01cdb13779f71108e04402e197ec10db398c12 (diff) |
Docs: Made resolving merge conflicts a local file
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | docs/resources/resolving-merge-conflicts.gif | bin | 0 -> 2249254 bytes |
2 files changed, 2 insertions, 2 deletions
@@ -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) diff --git a/docs/resources/resolving-merge-conflicts.gif b/docs/resources/resolving-merge-conflicts.gif Binary files differnew file mode 100644 index 000000000..0b943fd49 --- /dev/null +++ b/docs/resources/resolving-merge-conflicts.gif |