summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorLibravatar Evan Gates <evan.gates@gmail.com>2020-09-28 15:51:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-28 16:09:04 -0700
commit287416dba6258ab1819060fb62bb5df5d25aa10e (patch)
treea41e6dc2ee330b9450e6d6b8fa6b91bd24550ce9 /t/t3507-cherry-pick-conflict.sh
parentGit 2.28 (diff)
downloadtgif-287416dba6258ab1819060fb62bb5df5d25aa10e.tar.xz
Doc: show example scissors line
The text tries to say the code accepts many variations that look remotely like scissors and perforation marks, but gives too little detail for users to decide what is and what is not taken as a scissors line for themselves. Instead of describing the heuristics more, just spell out what will always be accepted, namely "-- >8 --", as it would not help users to give them more choices and flexibility and be "creative" in their scissors line. Signed-off-by: Evan Gates <evan.gates@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions