[fabiand@fiona packages]$ git-pull 
CONFLICT (rename/add): Renamed libs/bzip2/Makefile->utils/bzip2/Makefile in 18907bfa6da59a60a0c00633623a862a6abdf6c1. utils/bzip2/Makefile added in HEAD
Added as utils/bzip2/Makefile~HEAD instead
Automatic merge failed; fix conflicts and then commit the result.
[fabiand@fiona packages]$ git-mergetool 
merge tool candidates: meld kdiff3 tkdiff xxdiff meld gvimdiff opendiff emerge vimdiff
Merging the files: utils/bzip2/Makefile

Normal merge conflict for 'utils/bzip2/Makefile':
  {local}: created
  {remote}: created
Hit return to start merge resolution tool (meld): 
[fabiand@fiona packages]$ git-pull 
fatal: Entry 'utils/bzip2/Makefile' would be overwritten by merge. Cannot merge.
Merge with strategy recursive failed.
[fabiand@fiona packages]$