Initial Windows agent repository
This commit is contained in:
commit
a0db0c2e5b
10589 changed files with 3844063 additions and 0 deletions
34
OGP64/usr/libexec/git-core/mergetools/emerge
Normal file
34
OGP64/usr/libexec/git-core/mergetools/emerge
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
diff_cmd () {
|
||||
"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
|
||||
}
|
||||
|
||||
diff_cmd_help () {
|
||||
echo "Use Emacs' Emerge"
|
||||
}
|
||||
|
||||
merge_cmd () {
|
||||
if $base_present
|
||||
then
|
||||
"$merge_tool_path" \
|
||||
-f emerge-files-with-ancestor-command \
|
||||
"$LOCAL" "$REMOTE" "$BASE" \
|
||||
"$(basename "$MERGED")"
|
||||
else
|
||||
"$merge_tool_path" \
|
||||
-f emerge-files-command \
|
||||
"$LOCAL" "$REMOTE" \
|
||||
"$(basename "$MERGED")"
|
||||
fi
|
||||
}
|
||||
|
||||
merge_cmd_help () {
|
||||
echo "Use Emacs' Emerge"
|
||||
}
|
||||
|
||||
translate_merge_tool_path() {
|
||||
echo emacs
|
||||
}
|
||||
|
||||
exit_code_trustable () {
|
||||
true
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue