[procps] Re: first part of nls
- From: Sami Kerola <kerolasa@xxxxxx>
- To: procps-ng <procps@xxxxxxxxxxxxx>
- Date: Tue, 20 Dec 2011 17:45:38 +0100
On Tue, Dec 20, 2011 at 16:14, Sami Kerola <kerolasa@xxxxxx> wrote:
> Auto-merging watch.c
> CONFLICT (content): Merge conflict in watch.c
> Auto-merging ps/sortformat.c
> Auto-merging ps/parser.c
> Removing ps/it
> Auto-merging ps/global.c
> Auto-merging ps/display.c
> CONFLICT (content): Merge conflict in ps/display.c
> Removing ps/TRANSLATION
> Auto-merging proc/libprocfs.sym
> Auto-merging configure.ac
> CONFLICT (content): Merge conflict in configure.ac
> Auto-merging Makefile.am
> CONFLICT (content): Merge conflict in Makefile.am
> Automatic merge failed; fix conflicts and then commit the result.
>
> If you want me to take care of conflicts please do not move
> upstream/master HEAD.
Conflicts are resolved in my nls branch.
--
Sami Kerola
http://www.iki.fi/kerolasa/
Other related posts:
