File tree Expand file tree Collapse file tree 1 file changed +0
-2
lines changed
Expand file tree Collapse file tree 1 file changed +0
-2
lines changed Original file line number Diff line number Diff line change 552552 <x : String x : Key =" Text.MergeConflictEditor.Title" xml : space =" preserve" >Merge Conflicts</x : String >
553553 <x : String x : Key =" Text.MergeConflictEditor.UnsavedChanges" xml : space =" preserve" >Discard unsaved changes?</x : String >
554554 <x : String x : Key =" Text.MergeConflictEditor.UseMine" xml : space =" preserve" >USE MINE</x : String >
555- <x : String x : Key =" Text.MergeConflictEditor.UseMine.Tip" xml : space =" preserve" >Resolve current conflict using Mine version</x : String >
556555 <x : String x : Key =" Text.MergeConflictEditor.UseTheirs" xml : space =" preserve" >USE THEIRS</x : String >
557- <x : String x : Key =" Text.MergeConflictEditor.UseTheirs.Tip" xml : space =" preserve" >Resolve current conflict using Theirs version</x : String >
558556 <x : String x : Key =" Text.MergeConflictEditor.Undo" xml : space =" preserve" >UNDO</x : String >
559557 <x : String x : Key =" Text.MergeMultiple" xml : space =" preserve" >Merge (Multiple)</x : String >
560558 <x : String x : Key =" Text.MergeMultiple.CommitChanges" xml : space =" preserve" >Commit all changes</x : String >
You can’t perform that action at this time.
0 commit comments