go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-12-01 22:52:01 +02:00
Code Issues Releases Activity

add integration test for merge conflicts resolved externally

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-17 18:29:13 +11:00
parent ee622d044e
commit d3a3c8d87d
29 changed files with 100 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/integration/mergeConflictsResolvedExternally/expected/.git_keep/ORIG_HEAD Normal file
View File

@@ -0,0 +1 @@
769c8b8d89700f6f196b8331159150746a839662