global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 18:33:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

mergetool: refactored kdiff3 -> KDIFF3

Browse Source 
Use shell variable KDIFF3 instead of kdiff3 to call
kdiff3. This will be used in detection of the absolute
absolute path.
This commit is contained in:
Steffen Prohaska
2007-08-11 00:10:13 +02:00
committed by Dmitry Kakurin
parent 57bab054a9
commit fefe8db817
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-mergetool.sh
View File

@@ -13,6 +13,8 @@ SUBDIRECTORY_OK=Yes
. git-sh-setup
require_work_tree
KDIFF3=kdiff3
# Returns true if the mode reflects a symlink
is_symlink () {
test "$1" = 120000
@@ -191,10 +193,10 @@ merge_file () {
case "$merge_tool" in
kdiff3)
if base_present ; then
(kdiff3 --auto --L1 "$path (Base)" -L2 "$path (Local)" --L3 "$path (Remote)" \
("$KDIFF3" --auto --L1 "$path (Base)" -L2 "$path (Local)" --L3 "$path (Remote)" \
-o "$path" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1)
else
(kdiff3 --auto -L1 "$path (Local)" --L2 "$path (Remote)" \
("$KDIFF3" --auto -L1 "$path (Local)" --L2 "$path (Remote)" \
-o "$path" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1)
fi
status=$?