Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
mergetools/p4merge: swap LOCAL and REMOTE
[gitweb.git]
/
mergetools
/
p4merge
diff --git
a/mergetools/p4merge
b/mergetools/p4merge
index 8a36916567a234c354af9994df9c28788749e7fa..46b3a5a4ff378fad198a5dd518ff7969841b22b7 100644
(file)
--- a/
mergetools/p4merge
+++ b/
mergetools/p4merge
@@
-22,7
+22,7
@@
diff_cmd () {
merge_cmd () {
touch "$BACKUP"
$base_present || >"$BASE"
- "$merge_tool_path" "$BASE" "$
LOCAL" "$REMOTE
" "$MERGED"
+ "$merge_tool_path" "$BASE" "$
REMOTE" "$LOCAL
" "$MERGED"
check_unchanged
}