I dreamt I was doing perforce integrates. there was the output,
Diff chunks: 1 yours + 18 theirs + 1 both + 1 conflicting
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) [e]:
and I would type "at", "at", "at" and wonder if I should call a developer.
Posted by dracon at 18 November 2005 8:17