Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'da/mergetools-p4' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 19 Nov 2012 03:31:40 +0000
(19:31 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 19 Nov 2012 03:31:40 +0000
(19:31 -0800)
"git mergetool" feeds /dev/null as a common ancestor when dealing
with an add/add conflict, but p4merge backend cannot handle it. Work
it around by passing a temporary empty file.
* da/mergetools-p4:
mergetools/p4merge: Handle "/dev/null"
raw
|
combined
(merge:
3424da1
3facc60
)
Trivial merge