[PATCH] qf: replace colon when wiggling
Rodrigo Vivi
rodrigo.vivi at intel.com
Wed Aug 8 21:15:14 UTC 2018
On Wed, Aug 08, 2018 at 09:59:29AM -0700, Lucas De Marchi wrote:
> On Fri, Jul 13, 2018 at 11:16:12AM -0700, Rodrigo Vivi wrote:
> > On Fri, Jul 13, 2018 at 08:02:17AM -0700, Lucas De Marchi wrote:
> > > We are not writing anything after that message.
> >
> > I think I probably aimed to do something else different that
> > that commented out cat there...
> >
> > Anyways, ... is better, thanks
> >
> >
> > Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
>
> Ping. Just noticed this is still not merged.
ops, totally forgot that.
Pushed, thanks.
>
> Lucas De Marchi
>
> >
> >
> >
> > >
> > > Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> > > ---
> > > qf | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/qf b/qf
> > > index bffe9b753fa0..2ac071029992 100755
> > > --- a/qf
> > > +++ b/qf
> > > @@ -477,7 +477,7 @@ function qf_wiggle_push
> > > fi
> > >
> > > for file in $conflict_files ; do
> > > - echo wiggling in ${file%.rej}:
> > > + echo wiggling in ${file%.rej}...
> > > #cat $file
> > > rm -f ${file%.rej}.porig
> > > wiggle -r ${file%.rej} $file || true
> > > --
> > > 2.17.1
> > >
> > > _______________________________________________
> > > dim-tools mailing list
> > > dim-tools at lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/dim-tools
> > _______________________________________________
> > dim-tools mailing list
> > dim-tools at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dim-tools
More information about the dim-tools
mailing list