On Windows, a good 3-way diff/merge tool remains kdiff3 (WinMerge, for now, is still 2-way based, pending WinMerge3)
See “How do you merge in GIT on Windows?” and this config.
Update 7 years later (Aug. 2018): Artur Kędzior mentions in the comments:
If you guys happen to use Visual Studio (Community Edition is free), try the tool that is shipped with it: vsDiffMerge.exe. It’s really awesome and easy to use.
Related Posts:
- Why is “MINGW64” appearing on my Git bash?
- git clone: Authentication failed for
- Updates were rejected because the remote contains work that you do not have locally
- npm ERR! No git binary found in $PATH
- Python not working in the command line of git bash
- docker error : the input device is not a TTY. If you are using mintty, try prefixing the command with ‘winpty’
- difference between git merge origin/master and git pull
- How do I delete a Git branch locally and remotely?
- How do I delete a Git branch locally and remotely?
- How do I rename a local Git branch?
- How do I undo the most recent local commits in Git?
- How to merge branch to master?
- Git: How do I force “git pull” to overwrite local files?
- Differences between git pull origin master & git pull origin/master
- How do I rename a local Git branch?
- How can I switch to another branch in git?
- Using %PROGRAMFILES(x86)% on Windows OS 32bit
- how to get program files x86 env variable?
- Difference between masm32 and masm?
- How do I discard unstaged changes in Git?
- Git: How do I force “git pull” to overwrite local files?
- How do I start PowerShell from Windows Explorer?
- A fatal error occurred while creating a TLS client credential. The internal error state is 10013
- How do I discard unstaged changes in Git?
- How to upgrade Git on Windows to the latest version
- What does “@” mean in Windows batch scripts
- What are good grep tools for Windows? [closed]
- How to run a PowerShell script
- ‘git’ is not recognized as an internal or external command
- How do I install and use cURL on Windows?
- Download single files from GitHub
- How to list files in windows using command prompt (cmd). I’ve tried using ‘ ls ‘ as in Linux but it shows an error?
- Can’t connect to MySQL server on ‘localhost’ (10061) after Installation
- ow can I find where Python is installed on Windows?
- How can I make git accept a self signed certificate?
- Ignoring directories in Git repositories on Windows
- ‘git’ is not recognized as an internal or external command
- Setting Windows PowerShell environment variables
- Can’t connect to MySQL server on ‘localhost’ (10061) after Installation
- Why is Windows 32-bit called Windows x86 and not Windows x32?
- How to run a PowerShell script
- Git: How to squash all commits on branch
- The following untracked working tree files would be overwritten by merge, but I don’t care
- How can I revert multiple Git commits (already pushed) to a published repository?
- How can I open a cmd window in a specific location?
- The following untracked working tree files would be overwritten by merge, but I don’t care
- Undo git pull, how to bring repos to old state
- Python 3.2 Unable to import urllib2 (ImportError: No module named urllib2)
- Create an empty file on the commandline in windows (like the linux touch command)
- Filename too long in Git for Windows
- merge one local branch into another local branch
- How to solve “The directory is not empty” error when running rmdir command in a batch script?
- “X does not name a type” error in C++
- what is a “dump file” in windows task manager?
- Python 3.2 Unable to import urllib2 (ImportError: No module named urllib2)
- How do I run Redis on Windows?
- What does “Git push non-fast-forward updates were rejected” mean?
- Need to navigate to a folder in command prompt
- What is the difference between ‘git pull’ and ‘git fetch’?
- Undo git pull, how to bring repos to old state
- How do I create a Batch file to change an exe installer to Win XP SP3 compatibility mode and launch installer
- Python virtualenv questions
- Using putty to scp from windows to Linux
- ‘npm’ is not recognized as internal or external command, operable program or batch file
- Git: cannot do a partial commit during a merge (SourceTree)
- how to open an mp3 file with c
- Git: How do I force “git pull” to overwrite local files?
- What is the meaning of git reset –hard origin/master?
- What languages are Windows, Mac OS X and Linux written in?
- How can I reset or revert a file to a specific revision?
- Else clause on Python while statement
- How to run a makefile in Windows?
- Command Prompt “Net View System Error 6118”
- What is the difference between `git merge` and `git merge –no-ff`?
- How to compile LEX/YACC files on Windows?
- How to run ‘sudo’ command in windows
- How to exit Python script in Command Prompt?
- Python command not working in command prompt
- Batch script loop
- What is the ‘realtime’ process priority setting for?
- Verify return code: 20 when testing OpenSSL
- Git Bash won’t run my python files?
- The following untracked working tree files would be overwritten by merge, but I don’t care
- Command ‘ls’ not working in command prompt
- Command line for looking at specific port
- How to uninstall a Windows Service when there is no executable for it left on the system?
- openssh windows bad owner or permissions
- What is the default password for Postgres
- “X does not name a type” error in C++
- Windows Activator .bat Text
- How To Activate Windows 10
- ‘npm’ is not recognized as internal or external command, operable program or batch file
- how to edit or see the source code for dll files
- PermissionError: [WinError 5] Access is denied python using moviepy to write gif
- What is the difference between Cygwin and MinGW?
- Text editor to open big (giant, huge, large) text files
- Delete all local git branches
- UnicodeDecodeError: ‘charmap’ codec can’t decode byte X in position Y: character maps to
- PermissionError: [WinError 5] Access is denied python using moviepy to write gif
- Using GNU Scientific Library (GSL) under Windows x64 with MinGW