Skip to content

merge-ort: fix bug with renormalization and rename/delete conflicts

Elijah Newren via GitGitGadget git 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest1 patch 0 repliesNew
  2. v11 patch 3 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/1merge-ort: fix bug with renormalization and rename/delete conflictsmerge-ort.c t/t6418-merge-text-auto.sh+42 -30 replies

Reviews trailers per patch

The patch has a Reviewed-by or Acked-by.

PatchDerrick Stolee
1/1R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread