diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-05 20:09:34 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-10 00:23:01 +1100 |
| commit | 18f8c3d00a24e5d1d0c2c92f45625437fe3ef478 (patch) | |
| tree | c2d42c1ac705a5f0837e2034b1d63b1bcae1d38f /pkg | |
| parent | 074fbf6f25484579bb948031947317dbed83e983 (diff) | |
add merge conflicts integration test
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/gui/gui_test.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/gui/gui_test.go b/pkg/gui/gui_test.go index 7cf20de96..c90da8a64 100644 --- a/pkg/gui/gui_test.go +++ b/pkg/gui/gui_test.go @@ -54,6 +54,10 @@ func tests() []integrationTest { name: "patchBuilding2", fixture: "updatedFile", }, + { + name: "mergeConflicts", + fixture: "mergeConflicts", + }, } } |