Thomas Rast writes:
> log --remerge-diff: show what the conflict resolution changed
Yay ;-)
> This series explores another angle, which I call "remerge diff". It
> works by re-doing the merge in core, using features from patches 1-3
> and 7. Likely that will result in conflicts, which are f
Hi,
This may look intimidating, but it's actually 3.5 separate things:
merge-recursive: remove dead conditional in update_stages()
merge-recursive: internal flag to avoid touching the worktree
merge-recursive: -Xindex-only to leave worktree unchanged
These are unchanged from tr/merge-recur
2 matches
Mail list logo
