Git commit 841cec5f15203144edb6725011260a2b439adae1 by Yuri Chornoivan. Committed on 26/04/2021 at 06:13. Pushed by yurchor into branch 'master'.
Fix minor typos M +2 -2 doc/en/index.docbook https://invent.kde.org/sdk/kdiff3/commit/841cec5f15203144edb6725011260a2b439adae1 diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 0771059..62e5afa 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -1961,9 +1961,9 @@ and menu. Merging or folder comparison are not supported then. <qandaentry><question><para> Why does <userinput>git difftool --dir-diff</userinput> give "Mix of links and normal files error" when using KDiff3 as the difftool? </para></question><answer><para> - This is a side effect of gits internal workings. If you try to compare a previous revision to the current work tree git will compare actually files representing the past commit to symlinks pointing to the + This is a side effect of git's internal workings. If you try to compare a previous revision to the current work tree git will compare actually files representing the past commit to symlinks pointing to the worktree. As of 1.9 KDiff3 defaults to having <guilabel>Follow file links</guilabel> and <guilabel>Follow folder links</guilabel> on. Prior to this they were off by default. - This didn't matter when not doing if "Full analysis" was also off. However, with <guilabel>Full analysis</guilabel> on KDiff3 would intially attempt to compare the path pointed to by a link rather than fallow it. + This did not matter when not doing if "Full analysis" was also off. However, with <guilabel>Full analysis</guilabel> on KDiff3 would initially attempt to compare the path pointed to by a link rather than follow it. Prior to 1.8 the resulting error was ignored. However, 1.8 began reporting the error. </para></answer></qandaentry>
