On Sat, Feb 25, 2012 at 10:51:28AM +0100, Sami Kerola wrote: > I did some of that last night, and pushed change to my git clone. Your > and mine changes are in conflict. I'll > > https://gitorious.org/~kerolasa/procps/sami-procps-ng/commits/2012wk8 You're missing a word here: You'll <do something> to that push. Create? Fix? Use? push? Harrass Craig to get included? not sure. I assume once you've done whatever it is you'll let me know. > p.s. The s/util-linux/procps-ng/ change is good as-is. That's in the repository now. - Craig -- Craig Small VK2XLZ http://enc.com.au/ csmall at : enc.com.au Debian GNU/Linux http://www.debian.org/ csmall at : debian.org GPG fingerprint: 5D2F B320 B825 D939 04D2 0519 3938 F96B DF50 FEA5