Code review comment for lp:~dorins/qbzr/qdiff-changes

Revision history for this message
Dorin Scutarașu (dorins) wrote :

> Also I found that External Diff button does not work. Have you tested it?

I missed that somehow. Anyway, I fixed it today.

> Dorin Scutarașu пишет:
> > > I see you have added Ignore whitespace changes option. Does it related to this
> > > merge proposal: https://code.launchpad.net/~glenjamin/qbzr/qdiff-ignore-
> > > whitespace/+merge/35921 ?
> >
> > Yes. Looks like the other branch has similar changes except that the
> > UI is different: I added a menu item to toggle whitespace changes,
> > the other branch uses a command line parameter.

> @Dorin, can you merge the changes from the other branch, so I can land
> both branches soon? Or I can land the other branch first and you will
> update your patch later?

I just merged the changes from this merge proposal:
https://code.launchpad.net/~glenjamin/qbzr/qdiff-ignore-whitespace/+merge/35921
, which exposes an --ignore-whitespace option to qdiff.

« Back to merge proposal