Fossil SCM
Updated the meld example for the gmerge help output, from a [forum:/forumpost/f548a47462 | fix suggested on the forum].
Commit
375589e50ec65422dc4afb864e430ed350ffcefc5e2e6bb667f079993bb65d71
Parent
56262c7ea72d5c1…
1 file changed
+1
-1
M
src/db.c
+1
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -3998,11 +3998,11 @@ | ||
| 3998 | 3998 | ** The value is a graphical merge conflict resolver command operating |
| 3999 | 3999 | ** on four files. Examples: |
| 4000 | 4000 | ** |
| 4001 | 4001 | ** kdiff3 "%baseline" "%original" "%merge" -o "%output" |
| 4002 | 4002 | ** xxdiff "%original" "%baseline" "%merge" -M "%output" |
| 4003 | -** meld "%baseline" "%original" "%merge" "%output" | |
| 4003 | +** meld "%baseline" "%original" "%merge" --output "%output" | |
| 4004 | 4004 | */ |
| 4005 | 4005 | /* |
| 4006 | 4006 | ** SETTING: hash-digits width=5 default=10 |
| 4007 | 4007 | ** The number of hexadecimal digits of the SHA3 hash to display. |
| 4008 | 4008 | */ |
| 4009 | 4009 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3998,11 +3998,11 @@ | |
| 3998 | ** The value is a graphical merge conflict resolver command operating |
| 3999 | ** on four files. Examples: |
| 4000 | ** |
| 4001 | ** kdiff3 "%baseline" "%original" "%merge" -o "%output" |
| 4002 | ** xxdiff "%original" "%baseline" "%merge" -M "%output" |
| 4003 | ** meld "%baseline" "%original" "%merge" "%output" |
| 4004 | */ |
| 4005 | /* |
| 4006 | ** SETTING: hash-digits width=5 default=10 |
| 4007 | ** The number of hexadecimal digits of the SHA3 hash to display. |
| 4008 | */ |
| 4009 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3998,11 +3998,11 @@ | |
| 3998 | ** The value is a graphical merge conflict resolver command operating |
| 3999 | ** on four files. Examples: |
| 4000 | ** |
| 4001 | ** kdiff3 "%baseline" "%original" "%merge" -o "%output" |
| 4002 | ** xxdiff "%original" "%baseline" "%merge" -M "%output" |
| 4003 | ** meld "%baseline" "%original" "%merge" --output "%output" |
| 4004 | */ |
| 4005 | /* |
| 4006 | ** SETTING: hash-digits width=5 default=10 |
| 4007 | ** The number of hexadecimal digits of the SHA3 hash to display. |
| 4008 | */ |
| 4009 |