go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-29 22:48:24 +02:00
Code Issues Releases Activity

update merge conflict test

Browse Source
This commit is contained in:
Jesse Duffield
2021-04-05 11:26:31 +10:00
parent 3c20425649
commit f08f248cb7
69 changed files with 143 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/integration/mergeConflicts/expected/file5
View File

@@ -1,2 +1 @@
once upon a time there was a horse
once upon a time there was a mouse