From: Lukey Date: Sat, 30 Dec 2023 10:51:29 +0000 (+0000) Subject: (no commit message) X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~29^2~68^2~6 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=64199366264b971c9aa64dd6af2c0694ff9833d1;p=git-annex.git --- diff --git a/doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch.mdwn b/doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch.mdwn index 7fb44f5a8b..39f9997a2d 100644 --- a/doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch.mdwn +++ b/doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch.mdwn @@ -1,5 +1,5 @@ ### Please describe the problem. -While on an adjusted branch, merge conflicts neither manually nor with a git merge driver. See the transcript below. +While on an adjusted branch, merge conflicts can neither be resolved manually nor with a git merge driver. See the transcript below. ### What version of git-annex are you using? On what operating system?