Skip to content

Commit 812e566

Browse files
workbysaranyaira2
andauthored
Apply suggestion from @yaira2
Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com> Signed-off-by: Saravanan G <workbysaran@gmail.com>
1 parent d60b268 commit 812e566

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Files.App/Strings/en-US/Resources.resw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3133,7 +3133,7 @@
31333133
<value>You have uncommitted changes on this branch. What would you like to do with them?</value>
31343134
</data>
31353135
<data name="MergeInProgress" xml:space="preserve">
3136-
<value>You have an ongoing merge with unresolved conflicts. You must resolve or abort the merge before switching branches.</value>
3136+
<value>You have an ongoing merge with unresolved conflicts. Please resolve the conflicts or abort the merge to switch branches.</value>
31373137
</data>
31383138
<data name="AbortMergeAndSwitch" xml:space="preserve">
31393139
<value>Abort merge and switch to '{0}'</value>

0 commit comments

Comments
 (0)