The old code failed on Windows Vista. The output of
reg.exe or something else may be a bit different.
This patch improves the parsing code to be more robust.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Backslashes are converted to slashes right after the Windows
registry returned a path. This is needed to avoid problems
with shell expansion.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
kdiff3's homepage is http://kdiff3.sourceforge.net/.
kdiff3 is automatically added to the available
mergetools if its path is found in the Windows
Registry. The path is taken from the registry.
Be sure to set
git config core.autocrlf true
because kdiff3 seems to follow Windows crlf convention.
Make git-mergetool prefer meld under GNOME, and kdiff3 under KDE. When
considering emerge and vimdiff, check $VISUAL and $EDITOR to see which the
user might prefer.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Josh Triplett <josh@freedesktop.org>
This fixes complaints from Junio for how messages and prompts are
printed when resolving symlink and deleted file merges.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Create common function check_unchanged(), save_backup() and
remove_backup().
Also fix some minor whitespace issues while we're at it.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
If the file we are trying to merge resolve is in git-ls-files -u, then
skip the file existence test. If the file isn't reported in
git-ls-files, then check to see if the file exists or not to give an
appropriate error message.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
The git-mergetool program can be used to automatically run an appropriate
merge resolution program to resolve merge conflicts. It will automatically
run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
