〽️
knowledge
  • Introduction
  • SAP
    • ABAP
      • Delete table row within loop
      • SAP GUI progress indicator
      • Read classification from buffer
      • OpenSQL existence check
      • Update where-used list
      • Edit table records
      • Performance measurement
      • Change released task to unreleased/modifiable
      • User exits in sales
    • Transaction Code
      • Logical file names
      • Process overview
      • Multi level BOM comparison
      • Contract
      • Authorization data for user
      • Runtime analysis
      • Maintain Business Partner
      • Activate and Maintain Services
      • Undo changes with Engineering Change Management (ECM)
      • Display SAP directories
      • FPM workbench
      • Launchpad customizing
      • SAP Gateway Service Builder
  • Development
    • JavaScript (JS)
    • Web
    • Git
      • Revert commit
    • CSS
    • Database
    • Python
  • 3DEXPERIENCE
  • Windows
  • Science
  • General
    • Knowledge management
    • Media Management
    • Data Visualization
  • Linux
    • Extract files
Powered by GitBook
On this page
  • WinMerge as difftool on Windows
  • References
  1. Development

Git

PreviousWebNextRevert commit

Last updated 4 years ago

WinMerge as difftool on Windows

  1. Locate .gitconfig file

    e.g. C:\Users\<USER>\.gitconfig

  2. Add path to WinMerge UI

     ...
 [diff]
     tool = winmerge
 [difftool "winmerge"]
     cmd = "'C:/Program Files (x86)/WinMerge/WinMergeU.exe'" -e "$LOCAL" "$REMOTE"
 ...

Source: (2021)

References

  • (Stack Overflow 2017)

    git pull origin master --allow-unrelated-histories

  • with GPG Key

https://coderwall.com/p/76wmzq/winmerge-as-git-difftool-on-windows
Merge unrelated histories
Sign Commits at GitHub