diff options
author | Stefan Haller <stefan@haller-berlin.de> | 2024-03-02 10:24:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-02 10:24:36 +0100 |
commit | e9b04b8cfc569b10f77ff26b0113b4d2d05fe288 (patch) | |
tree | 590eec10820fa37e923ba14d198bf17ec6ee8324 /demo | |
parent | ee5533f9bf101e2ac313f9c0c41b280fb20d967c (diff) | |
parent | 253a0096f91fc100261030e591a1035b7efefc62 (diff) |
Allow more than one argument in git.merging.args config (#3336)
- **PR Description**
Fix a bug where merging would fail with an error message when you try to
put more than one argument in the `git.merging.args` config. This broke
with 25f8b0337e.
Fixes #3334.
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions