diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-08 09:31:27 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-08 09:31:27 +1100 |
| commit | 194c554357026f027d5ac378b5be8332b15c4c3f (patch) | |
| tree | f64db48d325a40403e1f1918d96d9f90d3801177 /pkg/gui | |
| parent | c65790b53d0c34974967149f878e95515a3bd6e8 (diff) | |
support ours/theirs merge conflict headers
Diffstat (limited to 'pkg/gui')
| -rw-r--r-- | pkg/gui/merge_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 13c32ca7d..64c17e6b4 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -24,7 +24,7 @@ func (gui *Gui) findConflicts(content string) ([]commands.Conflict, error) { for i, line := range utils.SplitLines(content) { trimmedLine := strings.TrimPrefix(line, "++") gui.Log.Info(trimmedLine) - if trimmedLine == "<<<<<<< HEAD" || trimmedLine == "<<<<<<< MERGE_HEAD" || trimmedLine == "<<<<<<< Updated upstream" { + if trimmedLine == "<<<<<<< HEAD" || trimmedLine == "<<<<<<< MERGE_HEAD" || trimmedLine == "<<<<<<< Updated upstream" || trimmedLine == "<<<<<<< ours" { newConflict = commands.Conflict{Start: i} } else if trimmedLine == "=======" { newConflict.Middle = i |