mirror of
https://github.com/git/git.git
synced 2024-06-02 10:36:15 +02: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>
25 lines
506 B
Plaintext
25 lines
506 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" --auto \
|
|
--L1 "$MERGED (A)" --L2 "$MERGED (B)" \
|
|
"$LOCAL" "$REMOTE" >/dev/null 2>&1
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" --auto \
|
|
--L1 "$MERGED (Base)" \
|
|
--L2 "$MERGED (Local)" \
|
|
--L3 "$MERGED (Remote)" \
|
|
-o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \
|
|
>/dev/null 2>&1
|
|
else
|
|
"$merge_tool_path" --auto \
|
|
--L1 "$MERGED (Local)" \
|
|
--L2 "$MERGED (Remote)" \
|
|
-o "$MERGED" "$LOCAL" "$REMOTE" \
|
|
>/dev/null 2>&1
|
|
fi
|
|
status=$?
|
|
}
|