mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
![David Aguilar](/assets/img/avatar_default.png)
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>
21 lines
392 B
Plaintext
21 lines
392 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
|
|
}
|
|
|
|
merge_cmd () {
|
|
touch "$BACKUP"
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" -wait -merge -3 -a1 \
|
|
"$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
|
|
else
|
|
"$merge_tool_path" -wait -2 \
|
|
"$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
|
|
fi
|
|
check_unchanged
|
|
}
|
|
|
|
translate_merge_tool_path() {
|
|
echo compare
|
|
}
|