| commit | aaed129d046863f4c76aa64beee211df594789e1 | |
| author | Thomas Wolf <thomas.wolf@paranor.ch> | |
| Thu, 29 Apr 2021 13:39:15 +0000 (29 15:39 +0200) | ||
| committer | Matthias Sohn <matthias.sohn@sap.com> | |
| Tue, 1 Jun 2021 10:32:05 +0000 (1 12:32 +0200) | ||
| tree | 254ee9319df9536ae216e479ad66af9c1d5e8444 | treesnapshot (tar.gz zip) |
| parent | 5996134fd793388bf747052023bf9ffacab21072 | commitdiff |
[merge] Hide changes between ancestor and current for cherry-pick
By default hide these changes. The ancestor in a cherry-pick is a
parent commit of 'theirs' (the commit that was cherry-picked); the
differences between that parent and the current version are simply
not interesting and even misleading.
Add an action to the content merge viewer's toolbar to allow the user
to toggle this setting for three-way comparisons.
Bug: 441149
Change-Id: I154cbecd445ef4481a1288c87c0e6e9cf498651f
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
By default hide these changes. The ancestor in a cherry-pick is a
parent commit of 'theirs' (the commit that was cherry-picked); the
differences between that parent and the current version are simply
not interesting and even misleading.
Add an action to the content merge viewer's toolbar to allow the user
to toggle this setting for three-way comparisons.
Bug: 441149
Change-Id: I154cbecd445ef4481a1288c87c0e6e9cf498651f
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
16 files changed:
