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?
@Glen, can you help Dorin to merge your patches, or do you prefer to
land your patch first?
Dorin Scutarașu пишет: /code.launchpad .net/~glenjamin /qbzr/qdiff- ignore- +merge/ 35921 ?
>> I see you have added Ignore whitespace changes option. Does it related to this
>> merge proposal: https:/
>> whitespace/
>
> 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?
@Glen, can you help Dorin to merge your patches, or do you prefer to
land your patch first?
Maybe you guys can collaborate on this feature?