go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-25 00:46:54 +02:00
Code Issues Releases Activity

Docs: Made resolving merge conflicts a local file

Browse Source
This commit is contained in:
Glenn Vriesman
2018-08-18 12:53:26 +02:00
parent fd01cdb137
commit 7b85d146af
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -90,7 +90,7 @@ whichever rc file you're using).
* Basic video tutorial [here](https://www.youtube.com/watch?v=VDXvbHZYeKY). * Basic video tutorial [here](https://www.youtube.com/watch?v=VDXvbHZYeKY).
* List of keybindings * List of keybindings
[here](https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md). [here](/docs/Keybindings.md).
## Cool features ## Cool features
* Adding files easily * Adding files easily
@ -101,7 +101,7 @@ whichever rc file you're using).
* Squash down and rename commits * Squash down and rename commits
### Resolving merge conflicts ### Resolving merge conflicts
![Gif](https://image.ibb.co/iyxUTT/shortermerging.gif) ![Gif](/docs/resources/resolving-merge-conflicts.gif)
### Viewing commit diffs ### Viewing commit diffs
![Viewing Commit Diffs](https://image.ibb.co/gPD02o/capture.png) ![Viewing Commit Diffs](https://image.ibb.co/gPD02o/capture.png)

BIN
docs/resources/resolving-merge-conflicts.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 MiB