|
OFF | cURL : OFF | WGET : ON | Perl : ON | Python : OFF Directory (0755) : /../proc/731/../117/../../lib/gnupg2/../libqmi/../git-core/mergetools/ |
| Home | ☍ Command | ☍ Upload File | ☍Info Server | ☍ Buat File | ☍ Mass deface | ☍ Jumping | ☍ Config | ☍ Symlink | ☍ About |
|---|
diff_cmd () {
"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
return 0
}
merge_cmd () {
# mergetool.winmerge.trustExitCode is implicitly false.
# touch $BACKUP so that we can check_unchanged.
"$merge_tool_path" -u -e -dl Local -dr Remote \
"$LOCAL" "$REMOTE" "$MERGED"
}
translate_merge_tool_path() {
mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
}