[sdk/kdiff3] doc/en: Drop referance to unimplemented option

Git commit 28c019a2bbaed98a1f028359fc9b2bc315c3ffa1 by Michael Reeves. Committed on 01/11/2020 at 16:46. Pushed by mreeves into branch 'master'. Drop referance to unimplemented option M +0-7doc/en/index.docbook https://invent.kde.org/sdk/kdiff3/commit

[sdk/kdiff3/1.10] /: Bump version

Git commit af23c2d8693d8a4b6cab2cba58b4790455fea704 by Michael Reeves. Committed on 01/05/2023 at 17:52. Pushed by mreeves into branch '1.10'. Bump version M +1-1CMakeLists.txt M +6-0ChangeLog M +1-1README M +1-1doc/en/index.docbook M +1-1src

[sdk/kdiff3/1.10] /: Bump version

Git commit b2d9bfbd91281d186d03dccb335a3e127e206fb6 by Michael Reeves. Committed on 27/03/2023 at 17:03. Pushed by mreeves into branch '1.10'. Bump version M +1-1CMakeLists.txt M +11 -2ChangeLog M +1-1README M +1-1doc/en/index.docbook M +1-1src

[sdk/kdiff3] /: Drop KParts support

Git commit f4039346058640b500a5a11093daffa9e6a80834 by Michael Reeves. Committed on 02/05/2023 at 18:46. Pushed by mreeves into branch 'master'. Drop KParts support Unable to effectivly test this aging code. M +0-25 doc/en/index.docbook M +0-4src/CMakeLists.txt M +24 -40

[sdk/kdiff3/1.10] /: Bump version

Git commit 83b464945ac8ea3a746b1792e8e6869e58830f5e by Michael Reeves. Committed on 13/07/2023 at 00:30. Pushed by mreeves into branch '1.10'. Bump version M +1-1README M +1-1doc/en/index.docbook M +1-1src/kdiff3part.desktop https://invent.kde.org/sdk/kdiff3/-/commit

[sdk/kdiff3/1.10] /: Bump version to 1.10.5

Git commit 75bd291f7946c27fc7d5f781b2037e4600111035 by Michael Reeves. Committed on 06/06/2023 at 18:39. Pushed by mreeves into branch '1.10'. Bump version to 1.10.5 M +1-1CMakeLists.txt M +4-0ChangeLog M +1-1README M +1-1doc/en/index.docbook M +1-1

[sdk/kdiff3] doc/en: Fix awkward wording

Git commit 20f11e63ff8875654b7f584c45b2035ba0dbd4ba by Michael Reeves. Committed on 12/06/2023 at 04:19. Pushed by mreeves into branch 'master'. Fix awkward wording M +1-1doc/en/index.docbook https://invent.kde.org/sdk/kdiff3/-/commit/20f11e63ff8875654b7f584c45b2035ba0dbd4ba diff

[sdk/kdiff3] /: Fix typos

Git commit 78bfdcb9180f96230b5e11505bb5ad2c2c04816b by Michael Reeves. Committed on 09/05/2023 at 20:27. Pushed by mreeves into branch 'master'. Fix typos M +1-1doc/en/index.docbook M +3-3src/LineRef.h M +2-2src/SourceData.cpp M +1-1src/guiutils.h M +5-5

[sdk/kdiff3/1.10] /: Bump version

Git commit 04f6b4253e9235f4f85193b78a0bcd40a4ddb036 by Michael Reeves. Committed on 17/05/2023 at 18:59. Pushed by mreeves into branch '1.10'. Bump version M +1-1CMakeLists.txt M +4-0ChangeLog M +1-1README M +1-1doc/en/index.docbook M +1-1src

[sdk/kdiff3/1.11] doc/en: Remove kpart keyword from doc

Git commit b69be6a458fffc0b1dfe44eaf22ed0e074f6cb65 by Michael Reeves. Committed on 29/04/2024 at 01:52. Pushed by mreeves into branch '1.11'. Remove kpart keyword from doc M +0-1doc/en/index.docbook https://invent.kde.org/sdk/kdiff3/-/commit/b69be6a458fffc0b1dfe44eaf22ed0e074f6cb65

[sdk/kdiff3] doc/en: Remove kpart keyword from doc

Git commit 4b99b1e3b08958ff3de40a8d7b084128d48e1a21 by Michael Reeves. Committed on 29/04/2024 at 01:53. Pushed by mreeves into branch 'master'. Remove kpart keyword from doc M +0-1doc/en/index.docbook https://invent.kde.org/sdk/kdiff3/-/commit/4b99b1e3b08958ff3de40a8d7b084128d48e1a21

D12995: add basic kdiff3 man page

mreeves added a comment. I'll have a look at the kf5 options. REPOSITORY R983 KDiff3 REVISION DETAIL https://phabricator.kde.org/D12995 To: lueck, mreeves, #documentation Cc: ltoscano, kde-doc-english, skadinna

D12995: add basic kdiff3 man page

mreeves added inline comments. INLINE COMMENTS > ltoscano wrote in man-kdiff3.1.docbook:193 > It looks like the KF5 options do not work right now, probably the code needs > to be fixed. Should be fixed in master. REPOSITORY R983 KDiff3 REVISION DETAIL https://phabricator.kde.org/D12995

D12995: add basic kdiff3 man page

mreeves added inline comments. INLINE COMMENTS > ltoscano wrote in CMakeLists.txt:2 > KDE_INSTALL_MANDIR ? Looks like yes. See D11697 REPOSITORY R983 KDiff3 REVISION DETAIL https://phabricator.kde.org/D12995 To: lueck, mreeves, #documentation Cc:

D12995: add basic kdiff3 man page

mreeves added a comment. Looks good. REPOSITORY R983 KDiff3 REVISION DETAIL https://phabricator.kde.org/D12995 To: lueck, mreeves, #documentation Cc: ltoscano, kde-doc-english, skadinna

[kdiff3] /: Revert "Generate man page for docbook/xml file."

Git commit a81aeb5052cdb3dcfc4efb866e30e09e12c5c7ab by Michael Reeves. Committed on 29/04/2018 at 23:02. Pushed by mreeves into branch 'master'. Revert "Generate man page for docbook/xml file." This reverts commit ac868cbf68137eec5ba68ec9a1ca7944ab195c60. M +1-2CMakeLists

[kdiff3] /: Generate man page for docbook/xml file.

Git commit ac868cbf68137eec5ba68ec9a1ca7944ab195c60 by Michael Reeves. Committed on 29/04/2018 at 21:06. Pushed by mreeves into branch 'master'. Generate man page for docbook/xml file. *fix install location for man page. M +2-1CMakeLists.txt A +95 -0cmake/Modules

[kdiff3] doc/en: Update help page

Git commit a075acf421a48a40ccddc6bd0e9deb06868b766b by Michael Reeves. Committed on 29/04/2018 at 21:22. Pushed by mreeves into branch 'master'. Update help page M +7-3doc/en/index.docbook https://commits.kde.org/kdiff3/a075acf421a48a40ccddc6bd0e9deb06868b766b diff --git a/doc/en

[kdiff3/1.x] doc: Remove translated doc and obsolete files

Git commit 83fe0d3d58411188a77168db7ec967a921d7832f by Michael Reeves, on behalf of Luigi Toscano. Committed on 14/02/2018 at 23:38. Pushed by mreeves into branch '1.x'. Remove translated doc and obsolete files Translated docbooks live elsewhere now. The README needs to be cut too. M +0-8

[kdiff3] /: Unoffical 1.7 release in the wild not based on this code bump version.

Git commit a814cee9b59c01446a35cdbfd36778488045d260 by Michael Reeves. Committed on 02/08/2018 at 02:17. Pushed by mreeves into branch 'master'. Unoffical 1.7 release in the wild not based on this code bump version. M +1-1ChangeLog M +2-12 README M +1-1doc/en

[kdiff3] /: Handle unquote args and fix handling white space in command path

Git commit dc3487fb24aeee7c0bce788b705b99d048e45f02 by Michael Reeves. Committed on 14/07/2018 at 02:40. Pushed by mreeves into branch 'master'. Handle unquote args and fix handling white space in command path M +3-5doc/en/index.docbook M +4-3src/pdiff.cpp https

[kdiff3] /: Fix behavior of preprocessor for sigle quotes

Git commit 311bf4ea4b5b4ee4b3c3b7fd46553cf60b3a45aa by Michael Reeves. Committed on 09/07/2018 at 03:13. Pushed by mreeves into branch 'master'. Fix behavior of preprocessor for sigle quotes The distinction between single and double quotes is purly a command shell issue. So silently convert

D17277: Add a small section on using KDiff3 as a git diff/merge tool

mreeves accepted this revision. REPOSITORY R983 KDiff3 REVISION DETAIL https://phabricator.kde.org/D17277 To: yurchor, #documentation, mreeves, lueck Cc: lueck, kde-doc-english, skadinna

[kdiff3] /: Update version for next release

Git commit 45759328a50510e1e31eee11f60709497dc18d26 by Michael Reeves. Committed on 05/04/2019 at 20:07. Pushed by mreeves into branch 'master'. Update version for next release M +1-1CMakeLists.txt M +1-1doc/en/index.docbook M +1-1windows_installer/kdiff3.nsi https

[kdiff3/1.8] doc/en: update release date

Git commit 27f9f7e26a3d3adff888b5fa42f3f5181d4c5f07 by Michael Reeves. Committed on 06/04/2019 at 01:47. Pushed by mreeves into branch '1.8'. update release date M +1-1doc/en/index.docbook https://commits.kde.org/kdiff3/27f9f7e26a3d3adff888b5fa42f3f5181d4c5f07 diff --git a/doc/en

[kdiff3] /: Update version/author info.

Git commit 1c4b82d720b8e4c8aaf7abaecda3b4cd3d656ee4 by Michael Reeves. Committed on 22/02/2019 at 18:21. Pushed by mreeves into branch 'master'. Update version/author info. M +1-1README M +11 -4doc/en/index.docbook M +2-2doc/en/man-kdiff3.1.docbook M +1-1

[kdiff3/1.8] /: update version number

Git commit 1e5d0ca25f724e047ab6564357d6c43e78361e1f by Michael Reeves. Committed on 20/05/2019 at 21:53. Pushed by mreeves into branch '1.8'. update version number M +1-1CMakeLists.txt M +1-1doc/en/index.docbook M +1-1windows_installer/kdiff3.nsi https

[kdiff3/1.8] /: update version

Git commit d36ba5acdd80d8bc28c790e08ccdabf1f7150819 by Michael Reeves. Committed on 17/05/2019 at 23:08. Pushed by mreeves into branch '1.8'. update version M +1-1CMakeLists.txt M +1-1doc/en/index.docbook M +1-1windows_installer/kdiff3.nsi https://commits.kde.org

D26064: Documentation improves

mreeves accepted this revision. mreeves added a comment. This revision is now accepted and ready to land. I will be able to conduct a proper review on Friday. From a quick glance through I seems ok from my end. REPOSITORY R983 KDiff3 BRANCH Documentation_improves (branched from master)

[kdiff3] /: Add --noauto option

Git commit a90c16f93988e6531db546f8d4ac404673ab240a by Michael Reeves. Committed on 21/02/2020 at 19:16. Pushed by mreeves into branch 'master'. Add --noauto option Implement feature request for disabling --auto as git is hard coded to pass this. BUG:176687 FIXED-IN:1.9 M +1-0doc/en

[kdiff3] /: Change ‘directory’ to ‘folder’ in user-visible strings

Git commit 181eda3c1ed7e392cfa08212b5f82071195a3457 by Michael Reeves, on behalf of Adrian Chaves. Committed on 19/01/2020 at 20:24. Pushed by mreeves into branch 'master'. Change ‘directory’ to ‘folder’ in user-visible strings M +229 -228 doc/en/index.docbook M +2-2doc/en/man

[kdiff3] doc/en: Fix compile with KF5DocTolls 5.44

Git commit ba6c263d372916800daceaffd6a282246c10f4cd by Michael Reeves. Committed on 30/12/2019 at 01:48. Pushed by mreeves into branch 'master'. Fix compile with KF5DocTolls 5.44 M +2-0doc/en/index.docbook https://invent.kde.org/kde/kdiff3/commit

[kdiff3] /: Fix version

Git commit bb021c887a073eee6d358c7d15887215094d3f32 by Michael Reeves. Committed on 30/12/2019 at 01:48. Pushed by mreeves into branch 'master'. Fix version M +1-1CMakeLists.txt M +1-1doc/en/index.docbook M +1-1windows_installer/kdiff3.nsi https://invent.kde.org/kde

[sdk/kdiff3] doc/en: Fix SYNOPSIS

Git commit f4781e60f0cbd1d161b0fea3724b00e441d7d93e by Michael Reeves. Committed on 24/07/2020 at 19:16. Pushed by mreeves into branch 'master'. Fix SYNOPSIS BUG: 424177 FIXED-IN:1.8.4 M +3-3doc/en/man-kdiff3.1.docbook https://invent.kde.org/sdk/kdiff3/commit

[sdk/kdiff3/1.8] doc/en: Fix SYNOPSIS

Git commit c58ba3c27d27fd49631912abaa9efb7c163c964e by Michael Reeves. Committed on 24/07/2020 at 19:17. Pushed by mreeves into branch '1.8'. Fix SYNOPSIS BUG: 424177 FIXED-IN:1.8.4 M +3-3doc/en/man-kdiff3.1.docbook https://invent.kde.org/sdk/kdiff3/commit

[sdk/kdiff3] doc/en: Fix typo in man page.

Git commit 9fab7d930972632266cc6528c063e80b24a904e5 by Michael Reeves. Committed on 15/07/2020 at 23:34. Pushed by mreeves into branch 'master'. Fix typo in man page. BUG:424177 FIXED-IN:1.8.4 M +1-1doc/en/man-kdiff3.1.docbook https://invent.kde.org/sdk/kdiff3/commit

[sdk/kdiff3/1.8] doc/en: Sorry mis-reading Fix second typo

Git commit b4a4502cdd726103cb8ee423c847e6180f4ba440 by Michael Reeves. Committed on 15/07/2020 at 23:44. Pushed by mreeves into branch '1.8'. Sorry mis-reading Fix second typo CCBUG:424177 (cherry picked from commit 35c6356ae92551666e208dcc87d96ca74b2c5e09) M +3-3doc/en/man-kdiff3.1

[sdk/kdiff3/1.8] doc/en: Fix typo in man page.

Git commit 0639492ab3bd29b2cf31d55681ab1f05947384ca by Michael Reeves. Committed on 15/07/2020 at 23:37. Pushed by mreeves into branch '1.8'. Fix typo in man page. BUG:424177 FIXED-IN:1.8.4 (cherry picked from commit 9fab7d930972632266cc6528c063e80b24a904e5) M +1-1doc/en/man-kdiff3.1

[sdk/kdiff3] doc/en: Sorry mis-reading Fix second typo

Git commit 35c6356ae92551666e208dcc87d96ca74b2c5e09 by Michael Reeves. Committed on 15/07/2020 at 23:43. Pushed by mreeves into branch 'master'. Sorry mis-reading Fix second typo CCBUG:424177 M +3-3doc/en/man-kdiff3.1.docbook https://invent.kde.org/sdk/kdiff3/commit

[sdk/kdiff3] doc/en: Add FAQ for common git difftool issue

Git commit 4c4878188c604941491b354a1df2f5c7b747ac26 by Michael Reeves. Committed on 26/04/2021 at 03:13. Pushed by mreeves into branch 'master'. Add FAQ for common git difftool issue BUG: 434778 FIXED-IN:1.9 M +9-2doc/en/index.docbook https://invent.kde.org/sdk/kdiff3/commit

[sdk/kdiff3] /: Update versions in docs

Git commit 50d40fb66123ba8a5c8bcc3660233a32dcdbf7d9 by Michael Reeves. Committed on 15/02/2021 at 18:59. Pushed by mreeves into branch 'master'. Update versions in docs M +8-8INSTALL M +1-1README M +1-1doc/en/index.docbook https://invent.kde.org/sdk/kdiff3/commit

[sdk/kdiff3/1.9] /: Update documents

Git commit dec9f763e83fb6fd46860dcbb3d4ca1d3f593725 by Michael Reeves. Committed on 15/02/2021 at 17:35. Pushed by mreeves into branch '1.9'. Update documents M +6-6INSTALL M +1-1doc/en/index.docbook M +1-1doc/en/man-kdiff3.1.docbook https://invent.kde.org/sdk/kdiff3

[sdk/kdiff3] /: Scrub unhandle --qall, fix man page to show noauto explaination

Git commit b68a00406ae18f426671e7fdc19587305f9b6544 by Michael Reeves. Committed on 13/02/2021 at 17:40. Pushed by mreeves into branch 'master'. Scrub unhandle --qall, fix man page to show noauto explaination M +0-1doc/en/index.docbook M +2-3doc/en/man-kdiff3.1.docbook M +0

[sdk/kdiff3] doc/en: Remove CVS references from docs.

Git commit 672d5550d15d413732df0e4de78256af12a1584e by Michael Reeves. Committed on 12/02/2021 at 00:11. Pushed by mreeves into branch 'master'. Remove CVS references from docs. M +6-5doc/en/index.docbook https://invent.kde.org/sdk/kdiff3/commit/672d5550d15d413732df0e4de78256af12a1584e

[sdk/kdiff3] doc/en: Document "Auto Dectect Unicode".

Git commit fc59f1005f41940ca8b62d152b63b4cdf822a5c3 by Michael Reeves. Committed on 25/01/2022 at 18:38. Pushed by mreeves into branch 'master'. Document "Auto Dectect Unicode". BUG:449076 FIXED-IN:1.9.70 M +2-0doc/en/index.docbook https://invent.kde.org/sdk/kdi

[sdk/kdiff3] doc/en: Copy edit docs

Git commit 4f33297d058915e75f9f6be8d6f9d8fc42bdc6a7 by Michael Reeves. Committed on 25/01/2022 at 18:46. Pushed by mreeves into branch 'master'. Copy edit docs M +1-1doc/en/index.docbook https://invent.kde.org/sdk/kdiff3/commit/4f33297d058915e75f9f6be8d6f9d8fc42bdc6a7 diff --git a/doc

[sdk/kdiff3] /: Repurpose Auto Detect "Unicode" preference

Git commit f2034ee291c989d173742b7b29e4eb1a30361af3 by Michael Reeves. Committed on 28/10/2023 at 04:11. Pushed by mreeves into branch 'master'. Repurpose Auto Detect "Unicode" preference This seems to have always functioned as an auto detect flag. In any event it that is now the expre

[sdk/kdiff3] /: Update version info

Git commit 2f6f383e1292c6ed17e293a855e6b7afb2e19af7 by Michael Reeves. Committed on 30/08/2022 at 16:08. Pushed by mreeves into branch 'master'. Update version info M +1-1CMakeLists.txt M +8-8INSTALL M +2-2README M +1-1doc/en/index.docbook M +1-1src

[sdk/kdiff3/1.10] /: Update version info

Git commit c6120046e1a68209a0f72a59ab2af8aec6cf99f1 by Michael Reeves. Committed on 06/09/2022 at 22:35. Pushed by mreeves into branch '1.10'. Update version info M +8-8INSTALL M +4-7README M +1-1doc/en/index.docbook M +7-0src/kdiff3part.desktop https

[sdk/kdiff3] doc/en: Update doc version

Git commit 0255602f3d2b27d245338395c139205c8a2fc6c2 by Michael Reeves. Committed on 31/12/2023 at 20:06. Pushed by mreeves into branch 'master'. Update doc version M +2-2doc/en/index.docbook https://invent.kde.org/sdk/kdiff3/-/commit/0255602f3d2b27d245338395c139205c8a2fc6c2 diff --git

[sdk/kdiff3] /: Update version info

Git commit 7af15f87d27bb2e319f90e54dc254b623fd6b10b by Michael Reeves. Committed on 31/12/2023 at 20:03. Pushed by mreeves into branch 'master'. Update version info M +7-7CMakeLists.txt M +10 -10 INSTALL M +1-1README M +1-1doc/en/index.docbook https

[sdk/kdiff3/1.11] doc/en: Update doc version

Git commit 7cea2ab6fab9ccae3bf8d7b057a3dfffd092509a by Michael Reeves. Committed on 31/12/2023 at 20:06. Pushed by mreeves into branch '1.11'. Update doc version (cherry picked from commit 0255602f3d2b27d245338395c139205c8a2fc6c2) M +2-2doc/en/index.docbook https://invent.kde.org/sdk

[sdk/kdiff3/1.10] /: Update version.

Git commit bb47d5939959c5c994e6e41fa09a91dbce258019 by Michael Reeves. Committed on 29/12/2023 at 23:38. Pushed by mreeves into branch '1.10'. Update version. M +1-1CMakeLists.txt M +1-1doc/en/index.docbook M +1-1src/kdiff3part.desktop https://invent.kde.org/sdk

[sdk/kdiff3] doc/en: man page: refer to Qt6 & KF6 version of commandline options

Git commit 383c5ee1a62d7a92a1192cf87526417b5d199717 by Michael Reeves, on behalf of Friedrich W. H. Kossebau. Committed on 08/04/2024 at 17:21. Pushed by mreeves into branch 'master'. man page: refer to Qt6 & KF6 version of commandline options M +2-2doc/en/man-kdiff3.1.docbook h