pr-git-1505/adamchainz/aj/merge-conflict-docs-improvements-v1
tagged this
05 May 13:58
From: Adam Johnson <me@adamj.eu>
Improvements:
1. Remove the sexist example ("Barbie... wants to go shopping")
2. Show real merge marker contents, rather than e.g. "yours:sample.txt".
3. Swap yours/theirs terms for source/target.
4. General wordsmithing.
Signed-off-by: Adam Johnson <me@adamj.eu>
Submitted-As: https://lore.kernel.org/git/pull.1505.git.git.1683295133304.gitgitgadget@gmail.com
Assets 2
-
2023-05-05T13:58:53Z -
2023-05-05T13:58:53Z - Loading