Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 382
    • Issues 382
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 16
    • Merge requests 16
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #3557
Closed
Open
Issue created Mar 22, 2020 by Polys Georgiou@polys

TortoiseGitMerge 'Use this text block' not working

What steps will reproduce the problem?

  1. Edit a file in some repo - any change will do
  2. Go to Git Commit
  3. Right-click the modified file and click Compare with base - TortoiseGitMerge should open
  4. Right-click a modified line on the left side and click Use this text block

What is the expected output? What do you see instead?

Expected the line on the right to be replaced by the line on the left.

In the latest release (2.10.0.1) this appears to have no effect; nothing happens to the line on the right. However, TortoiseGitMerge shows the file modified after clicking Use this text block.

What version of TortoiseGit and Git are you using? On what operating system?

TortoiseGit 2.10.0.1 64-bit

git version 2.25.1.windows.1

Windows 10 (version 1909)

Please provide any additional information below.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking