rax@crawl:~/scoring$ sudo git pull
M	.gitignore
M	README
A	config.py
U	crawl_utils.py
M	database.sql
D	fsc.el
M	html.py
D	link-setup
D	missing_from_outline.txt
D	morgue.py
A	morgue/__init__.py
A	morgue/base.py
A	morgue/game_matcher.py
A	morgue/time.py
U	morgue/util.py
D	nemchoice.py
M	query.py
U	scload.py
A	sources.py
A	sources.yml
M	stats.py
A	version.py
A	xlog/__init__.py
A	xlog/version.py
A	xlog/xlog_def.py
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'.