Sign in
googlers
/
jrn
/
git
/
d9be2485e284d9d73b071b2946fff0b19f97aaa7
/
.
/
mergetools
/
p4merge
blob: 1a45c1b0c5128335fc340e7d6409b4e772419a07 [
file
] [
log
] [
blame
]
diff_cmd
()
{
"$merge_tool_path"
"$LOCAL"
"$REMOTE"
}
merge_cmd
()
{
touch
"$BACKUP"
$base_present
||
>
"$BASE"
"$merge_tool_path"
"$BASE"
"$LOCAL"
"$REMOTE"
"$MERGED"
check_unchanged
}