| commit | 9426150e58f43bba3657b411c815811ccdd861bf | |
| author | NeilBrown <neilb@suse.de> | |
| Wed, 21 Aug 2013 00:19:30 +0000 (21 10:19 +1000) | ||
| committer | NeilBrown <neilb@suse.de> | |
| Wed, 21 Aug 2013 00:19:30 +0000 (21 10:19 +1000) | ||
| tree | 4148a8b746b86c26d9de6dd0a2695df7ecf7194c | treesnapshot (tar.gz zip) |
| parent | a1ddba04756f62aefde5bf6521285f26f10ae669 | commitdiff |
vpatch: simplify display of editted mergers.
Rather than having some special cases, simply use the original 'type'
unless RESULT is requested. In that case use the new 'type'.
This is much more general and seems to work OK.
Signed-off-by: NeilBrown <neilb@suse.de>
Rather than having some special cases, simply use the original 'type'
unless RESULT is requested. In that case use the new 'type'.
This is much more general and seems to work OK.
Signed-off-by: NeilBrown <neilb@suse.de>
| vpatch.c | diffblobblamehistory |