|
OFF | cURL : OFF | WGET : ON | Perl : ON | Python : OFF Directory (0755) : /media/../../lib/init/../nagios/../modules/../pm-utils/../git-core/mergetools/ |
| Home | ☍ Command | ☍ Upload File | ☍Info Server | ☍ Buat File | ☍ Mass deface | ☍ Jumping | ☍ Config | ☍ Symlink | ☍ About |
|---|
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" \
"$LOCAL" "$MERGED" "$REMOTE" \
"$BASE" | cat
else
"$merge_tool_path" \
"$LOCAL" "$MERGED" "$REMOTE" | cat
fi
}