gistfile1.txt

[mjd@xiaomao zen-cart]$ git pull origin master
U	zen-cart/admin/includes/configure.php
U	zen-cart/admin/includes/dist-configure.php
A	zen-cart/includes/configure.php
D	zen-cart/includes/dist-configure.php
U	zen-cart/secret_lair/includes/dist-configure.php
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
[mjd@xiaomao zen-cart]$