diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-26 13:15:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-26 13:15:24 -0700 |
| commit | 183f88018a849ae755b1efb7b63c58e38368e60f (patch) | |
| tree | bda282f98cefd5cec0c9e780a5c069a3d0edaf42 /ll-merge.c | |
| parent | 7f95f2dce01e03532206d0998bca4cbdd8a660c7 (diff) | |
| parent | 4fa5c0591a7b5c71c8ccf71d8401c3337b7867ad (diff) | |
| download | git-183f88018a849ae755b1efb7b63c58e38368e60f.tar.gz | |
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
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions