Andrew's git / gitweb.git / diff
?
Merge branch 'kb/p4merge'
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Mar 2013 20:15:24 +0000 (13:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Mar 2013 20:15:24 +0000 (13:15 -0700)
Adjust the order mergetools feeds the files to the p4merge backend
to match the p4 convention.

* kb/p4merge:
merge-one-file: force content conflict for "both sides added" case
git-merge-one-file: send "ERROR:" messages to stderr
git-merge-one-file: style cleanup
merge-one-file: remove stale comment
mergetools/p4merge: create a base if none available
mergetools/p4merge: swap LOCAL and REMOTE

1  2 
git-merge-one-file.sh patch | diff1 | diff2 | blob | history
git-sh-setup.sh patch | diff1 | diff2 | blob | history
diff --cc git-merge-one-file.sh
Simple merge
diff --cc git-sh-setup.sh
Simple merge