[procps] Re: [pull] long options, usages & man page alignments

  • From: Jim Warner <james.warner@xxxxxxxxxxx>
  • To: procps@xxxxxxxxxxxxx
  • Date: Mon, 3 Oct 2011 16:36:32 -0500

On Oct 3, 2011, at 3:02 PM, Sami Kerola wrote:

> Good evening,
> 
> The style-fixes branch is ready for review...

Sami,

Are you sure they're ready?  I get several merge errors.

CONFLICT (content): Merge conflict in autogen.sh
Auto-merging free.c
Auto-merging pgrep.1
CONFLICT (content): Merge conflict in pgrep.1
Auto-merging pmap.1
CONFLICT (content): Merge conflict in pmap.1
Auto-merging pmap.c
CONFLICT (content): Merge conflict in pmap.c
Auto-merging proc/readproc.h
Auto-merging pwdx.1
CONFLICT (content): Merge conflict in pwdx.1
Auto-merging slabtop.1
CONFLICT (content): Merge conflict in slabtop.1
Auto-merging uptime.1
CONFLICT (content): Merge conflict in uptime.1
Auto-merging w.1
CONFLICT (content): Merge conflict in w.1

Jim

Other related posts:

  1. Home
  2. procps
  3. Archive
  4. 10-2011