mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-02 10:13:53 -05:00
6c95f535e9
"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"