From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Mar 2013 20:15:24 +0000 (-0700)
Subject: Merge branch 'kb/p4merge'
X-Git-Tag: v1.8.3-rc0~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=183f88018a849ae755b1efb7b63c58e38368e60f;p=thirdparty%2Fgit.git

Merge branch 'kb/p4merge'

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
---

183f88018a849ae755b1efb7b63c58e38368e60f