Fossil SCM
Add an example of how to include "meld" as the "gmerge-command".
Commit
85b235982e99d31ca981c8630d05f5db5e48c251
Parent
e3e43bbec5360de…
1 file changed
+1
M
src/db.c
+1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1710,10 +1710,11 @@ | ||
| 1710 | 1710 | ** |
| 1711 | 1711 | ** gmerge-command A graphical merge conflict resolver command operating |
| 1712 | 1712 | ** on four files. |
| 1713 | 1713 | ** Ex: kdiff3 "%baseline" "%original" "%merge" -o "%output" |
| 1714 | 1714 | ** Ex: xxdiff "%original" "%baseline" "%merge" -M "%output" |
| 1715 | +** Ex: meld "%baseline" "%original" "%merge" "%output" | |
| 1715 | 1716 | ** |
| 1716 | 1717 | ** http-port The TCP/IP port number to use by the "server" |
| 1717 | 1718 | ** and "ui" commands. Default: 8080 |
| 1718 | 1719 | ** |
| 1719 | 1720 | ** ignore-glob The VALUE is a comma-separated list of GLOB patterns |
| 1720 | 1721 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1710,10 +1710,11 @@ | |
| 1710 | ** |
| 1711 | ** gmerge-command A graphical merge conflict resolver command operating |
| 1712 | ** on four files. |
| 1713 | ** Ex: kdiff3 "%baseline" "%original" "%merge" -o "%output" |
| 1714 | ** Ex: xxdiff "%original" "%baseline" "%merge" -M "%output" |
| 1715 | ** |
| 1716 | ** http-port The TCP/IP port number to use by the "server" |
| 1717 | ** and "ui" commands. Default: 8080 |
| 1718 | ** |
| 1719 | ** ignore-glob The VALUE is a comma-separated list of GLOB patterns |
| 1720 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1710,10 +1710,11 @@ | |
| 1710 | ** |
| 1711 | ** gmerge-command A graphical merge conflict resolver command operating |
| 1712 | ** on four files. |
| 1713 | ** Ex: kdiff3 "%baseline" "%original" "%merge" -o "%output" |
| 1714 | ** Ex: xxdiff "%original" "%baseline" "%merge" -M "%output" |
| 1715 | ** Ex: meld "%baseline" "%original" "%merge" "%output" |
| 1716 | ** |
| 1717 | ** http-port The TCP/IP port number to use by the "server" |
| 1718 | ** and "ui" commands. Default: 8080 |
| 1719 | ** |
| 1720 | ** ignore-glob The VALUE is a comma-separated list of GLOB patterns |
| 1721 |