Initial class construction
This commit is contained in:
1 parent
67f2d57e03
commit
431ff5f7d4
5813 files changed
+1622108
No files matched your search
@@ -0,0 +1,18 @@
|
||||
diff_cmd () {
|
||||
"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
merge_cmd () {
|
||||
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
|
||||
}
|
||||
|
||||
translate_merge_tool_path() {
|
||||
echo compare
|
||||
}
|
||||
Reference in new issue
Block a user