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
  • #2514
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

diff uses wrong tool in case the filename matches a registered extension

By stepan.hr... on May 30, 2015 13:07 (imported from Google Code)


What steps will reproduce the problem?
1.Add file "doc" to repository.
2.Modify it.
3.Compare it with base.

What is the expected output? What do you see instead?
I expect TortoiseGitMerge, but LibreOffice is started instead.

What version of TortoiseGit and msysgit are you using? On
what operating system?
TortoiseGit 1.8.14.0, git version 1.9.5.msysgit.1, Windows 7 x64.

Please provide any additional information below.
This is patch for the same bug in TortoiseSVN:
http://sourceforge.net/p/tortoisesvn/code/22578

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