Replace A and B with First, Second, Selected, Parent + commit message beginning.

Handle added and deleted files. Closes  #1917.