2002-03-14 19:36:57+01 by Dan Lyke 1 comments
Reason Perforce scares me #4165:
machine$ p4 resolve
/long/path/to/filename.c - merging //repository/to/filename.c
Diff chunks: 0 yours + 134 theirs + 0 both + 7 conflicting
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) [e]:
[ related topics: Dan's Life Software Engineering ]
comments in descending chronological order (reverse):
#Comment made: 2002-03-15 14:26:04+01 by: meuon
Dan Lyke: Circa 1994
"It's not what a program does, it's what a program does when it doesn't."
Dan Lyke: Circa 2002
Sounds like it still applies, don't you like cryptic messages?
We will not edit your comments. However, we may delete your comments, or cause them to be hidden behind another link, if we feel they detract from the conversation. Commercial plugs are fine, if they are relevant to the conversation, and if you don't try to pretend to be a consumer. Annoying endorsements will be deleted if you're lucky, if you're not a whole bunch of people smarter and more articulate than you will ridicule you, and we will leave such ridicule in place.
Flutterby™ is a trademark claimed by
Dan Lyke for the web publications at www.flutterby.com and www.flutterby.net.