Skip to content

Conversation

pmiossec
Copy link
Member

fixes #11651

Introduced by 3a7e5d8 (#11619)

Screenshots

No changes for english version.

Test methodology

  • Build and run

Test environment(s)

  • Git Extensions 33.33.33
  • Build 9c707d5
  • Git 2.44.0.windows.1
  • Microsoft Windows NT 10.0.22631.0
  • .NET 8.0.1
  • DPI 96dpi (no scaling)
  • Portable: False
  • Microsoft.WindowsDesktop.App Versions
    Microsoft.WindowsDesktop.App 6.0.26 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]
    Microsoft.WindowsDesktop.App 7.0.15 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]
    Microsoft.WindowsDesktop.App 8.0.1 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).


✒️ I contribute this code under The Developer Certificate of Origin.

@RussKie RussKie merged commit 52b29db into gitextensions:master Mar 28, 2024
@RussKie
Copy link
Member

RussKie commented Mar 28, 2024

Thank you

@RussKie RussKie added this to the vNext milestone Mar 28, 2024
@pmiossec pmiossec deleted the fix_resolve_conflicts_translations branch March 28, 2024 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Avoid fragmented "Take only ..." messages
2 participants