mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +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>
10 lines
191 B
Text
10 lines
191 B
Text
diff_cmd () {
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
|
}
|
|
|
|
merge_cmd () {
|
|
touch "$BACKUP"
|
|
$base_present || >"$BASE"
|
|
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
|
|
check_unchanged
|
|
}
|