ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 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

6
test/integration/mergeConflictsResolvedExternally/config/config.yml Normal file
View File

@@ -0,0 +1,6 @@
disableStartupPopups: true
customCommands:
- key: 'N'
description: 'Resolve conflict'
context: 'files'
command: 'echo "master2" > file'