/
usr
/
libexec
/
git-core
/
mergetools
/
File Upload :
llllll
Current File: //usr/libexec/git-core/mergetools/emerge
diff_cmd () { "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" } 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 status=$? } translate_merge_tool_path() { echo emacs }
Copyright ©2k19 -
Hexid
|
Tex7ure