/
usr
/
libexec
/
git-core
/
mergetools
/
File Upload :
llllll
Current File: //usr/libexec/git-core/mergetools/bc3
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } merge_cmd () { touch "$BACKUP" if $base_present then "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \ -mergeoutput="$MERGED" else "$merge_tool_path" "$LOCAL" "$REMOTE" \ -mergeoutput="$MERGED" fi check_unchanged } translate_merge_tool_path() { if type bcomp >/dev/null 2>/dev/null then echo bcomp else echo bcompare fi }
Copyright ©2k19 -
Hexid
|
Tex7ure