mirror of
https://github.com/git/git.git
synced 2024-11-15 21:53:44 +01:00
bc7a96a896
Individual merge tools are now defined in a mergetools/$tool file which is sourced at runtime. The individual files are installed into $(git --exec-path)/mergetools/. New tools can be added by creating a new file instead of editing the git-mergetool--lib.sh scriptlet. http://thread.gmane.org/gmane.comp.version-control.git/134906/focus=135006 Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 lines
279 B
Text
17 lines
279 B
Text
can_diff () {
|
|
return 1
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
touch "$BACKUP"
|
|
"$merge_tool_path" \
|
|
-base:"$BASE" -mine:"$LOCAL" \
|
|
-theirs:"$REMOTE" -merged:"$MERGED"
|
|
check_unchanged
|
|
else
|
|
echo "TortoiseMerge cannot be used without a base" 1>&2
|
|
return 1
|
|
fi
|
|
}
|