Log - 23547c40518ac04a20acf2f688114f5d97b61f24 - jrn/git

919df31 Collect merge-related tests to t64xx by Elijah Newren · 4 years, 7 months ago[Renamed from t/t6047-diff3-conflict-markers.sh]
10cdb9f rebase: rename the two primary rebase backends by Elijah Newren · 5 years ago
76340c8 rebase tests: repeat some tests using the merge backend instead of am by Elijah Newren · 5 years ago
8e4ec33 merge-recursive: fix the diff3 common ancestor label for virtual commits by Elijah Newren · 5 years ago
743474c merge-recursive: provide a better label for diff3 common ancestor by Elijah Newren · 6 years ago