Sina Hinderks 35d681dd50 fix: merge.ff is ignored (#1501) ...

After changing the priority of the preferences/configurations for the
merge mode in #1495, the git configuration `merge.ff` was ignored.  The
reason is, that `GetSettingsPreferredMergeMode()` does not return `null`
in the default case.  This is now fixed.

2025-07-03 15:20:03 +08:00

..

Commands

code_review: PR #1497

2025-07-03 11:15:14 +08:00

Converters

code_style: general cleanup (#1469)

2025-06-28 10:25:56 +08:00

Models

code_style: general cleanup (#1497)

2025-07-03 10:32:03 +08:00

Native

code_style: general cleanup (#1497)

2025-07-03 10:32:03 +08:00

Resources

localization: update German translations (#1494)

2025-07-03 10:15:44 +08:00

ViewModels

fix: merge.ff is ignored (#1501)

2025-07-03 15:20:03 +08:00

Views

code_review: PR #1497

2025-07-03 11:15:14 +08:00

App.axaml

refactor: use DataGrid instead of ListBox displaying history commits

2025-06-30 15:01:18 +08:00

App.axaml.cs

code_review: PR #1497

2025-07-03 11:15:14 +08:00

App.Commands.cs

refactor: use custom view locator to create new window/dialog (#1216)

2025-04-21 15:32:21 +08:00

App.ico

project: reorganize the structure of the project.

2024-04-02 20:00:33 +08:00

App.JsonCodeGen.cs

feature: remember author column width

2025-06-30 20:25:10 +08:00

App.manifest

typos: (#1397)

2025-06-06 12:10:55 +08:00

SourceGit.csproj

refactor: use DataGrid instead of ListBox displaying history commits

2025-06-30 15:01:18 +08:00