pr-git-1494/adamchainz/git_merge_conflicts-v1
tagged this
10 Apr 14:03
From: Adam Johnson <me@adamj.eu>
Imporvements:
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.1494.git.git.1681135384039.gitgitgadget@gmail.com
Assets 2
-
2023-04-10T14:03:04Z -
2023-04-10T14:03:04Z -