git pull
git add cities.html

abort
quit
git pull
 .DS_Store
B:wq

B
A
A
A
A
~
:wq

A:wq
:wq
:quit
B

:wq
:exit
:quit
:qw
:
:wq
!q
:wq

B
B
B
B
B
B
A
A
A
B
B
B
B
B

A
A
B
B
erge branch 'master' of https://github.com/simonrai/git-mania