kdiff3: add configuration for merge arguments

to prevent ugly inconsistent look
changes are still displayed when FormThemeEditor is open
resta...

Add and refactor diffmerge tools

CI: Improve Azure Devops builds

by filtering on the FinishTime instead of the StartTime

+ solve time management as AzureDevOps ...

by removing the use of the event
and relying on control placement configuration
to keep the sa...

because as it is implemented now, the 2 first calls (to retrieve today finished builds and all f...

* refactoring & cleaning

* Ensure query to get build definition is called once (and not twice...

Dark theme

to build with Visual Studio 2019

- switch to small font in case of clipped controls
(should fit for screens with a height of 7...

Filter staged files

- add button which deletes the file filter
- workaround for match getting selected

(cherry picked from commit eff095a3ba0c33cb2cbb056b95e8203458337b9e)

Fix regression introduced in 3fcb4788b42d9b485880eb756e4bdc0af47d321b

where application is fo...

* Refactor how diff/merge tools are defined and configured,
each tool is moved into own type/cla...

(cherry picked from commit 8d66094cd762ad73220bb5a5fe0a8af96854f2f9)

* Update translations
* Update contributtos
* Update changlog

depending if some builds are running (refresh interval is 10s)
or not (interval is 120s)

......

Define .editorconfig for C#

* Update vs-threading to 16.4.33
* Apply timeouts to JoinTillEmptyAsync

Prevent http calls to be made (and fail) when the settings are invalid
(project url missing)

...

catch cannot write to settings

Update packages

Closes #7385

fix: SetRevisionFunc produce empty dropdown

`ShowDropDown` call would cause an dummy dropdown item
shown on a screen while app was loading.
...

FormReflog : fix crash when switching from reference

If a user selected a different row from the top, upon rescan/refresh of
the dialog there would ...

`_lastHitRowIndex` contained a bad value after the switch
and could be higher than the number of...

CommitMessage: Only save if directory exists

fix: Crash on Missing Settings Directory

A settings file could not be created and the app would crash, if a user's
settings directory is ...

- `TestResults.xml` as AppVeyor artifact
- less parallel test execution
- timeout per test case

also if tests failed

Show syntax highlighting also when displaying a diff

Limit removable for "Contained in branches/tags"

- add link to show all "contained in branches/tags"
- show relevant branches (current & masters)...

with an option in the diff toolbar to enable/disable it

fix: Fail attempting an empty path

Ignore empty paths.

The ap would fail if a user passed an invalid repo path such as:
`"C:\porta...

Implement git-reset --merge and --keep options

fix incorect use of TestAccessor struct

Also add `NoAssertContext` class to prevent tests deadlocking or
failing on `Debug.Fail` stateme...

Refactor FormClone.ToTextUpdate()

Add Submodule: Fill combobox with branches regardless of the repo URL type

* Skip duplicate ref entries when building the Sorted Refs Dictionary

* sign CLA

Commit messages menu: Fix (sometimes) broken display

Incorrect placement of update submodules on checkout setting #7290

When building the commit message history to display in the dropdown menu,
and the commit message...

Added code and logic for the "Update submodules on checkout" on General Settings Page.
Removed t...

Document that PowerShell scripts are run detached

Don't assume e.Node could be null

Fix 7364: "Fetch and Prune All" confirmation modal has weird focus behavior

Enable auto update

- use the proper window owner when showing the "fetch and prune all" confirmation dialog (to fi...

Incorrect tab order on multiple settings pages #7301

Updated the TabIndex on Appearance Settings page.
Updated the TabIndex on Appearance Color Setti...