thresh@exchange devel/packages/ffmpeg $ git pull . upstream
Trying really trivial in-index merge...
fatal: Merge requires file-level merging
Nope.
Merging HEAD with 41ef2a295359b60defd24ce1a9b0014a483af7d9
Merging:
61fea0da3d1c51f49f39e937c6529032e446f02c Merge branch 'upstream' into mybranch
41ef2a295359b60defd24ce1a9b0014a483af7d9 Merge remote branch 'git-svn' into upstream
found 1 common ancestor(s):
97d85dffebcfcdab13ced8890765261455f3434c Merge remote branch 'git-svn' into upstream
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging configure
CONFLICT (content): Merge conflict in configure

Automatic merge failed; fix conflicts and then commit the result.
thresh@exchange devel/packages/ffmpeg $