On Wed, Mar 06, 2013 at 09:36:42PM +0100, Uwe Kleine-König wrote:
> "zdiff3" is identical to ordinary diff3, only it allows more aggressive
> compaction than diff3. This way the displayed base isn't necessary
> technically correct, but still this mode might help resolving merge
> conflicts between two near identical additions.
> Signed-off-by: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
I think the patch is correct, assuming this is the interface we want.
It would be more flexible instead to have:
1. user can configure zealous-level of merge via command-line or
config (they cannot control it at all right now)
2. when diff3 is used and no level is explicitly given, do not go
3. otherwise, respect the level given by the user, even if it is
But that would involve a lot of refactoring. I don't know if it is worth
the effort (the bonus is that people can then set the level
independently, but I do not know that anyone ever wants to do that).
> builtin/merge-file.c | 2 ++
> contrib/completion/git-completion.bash | 2 +-
> xdiff-interface.c | 2 ++
> xdiff/xdiff.h | 1 +
> xdiff/xmerge.c | 8 +++++++-
> 5 files changed, 13 insertions(+), 2 deletions(-)
I think this would need documentation not only to let users know about
the feature, but also to warn them of the caveats.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html