Fossil SCM
Whitespace removal
Commit
bbf6c30747c6a45deec536609c10b08224b1254c921eaa666bd4b9782e3f9c16
Parent
6ebc9e0e238a985…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -253,11 +253,11 @@ | ||
| 253 | 253 | ** information needed to display the changes to |
| 254 | 254 | ** FILE caused by the most recent merge. FILE must |
| 255 | 255 | ** be a pathname relative to the root of the check-out. |
| 256 | 256 | ** --tk Bring up a Tcl/Tk GUI that shows the changes |
| 257 | 257 | ** associated with the most recent merge. |
| 258 | -** | |
| 258 | +** | |
| 259 | 259 | */ |
| 260 | 260 | void merge_info_cmd(void){ |
| 261 | 261 | const char *zCnt; |
| 262 | 262 | const char *zTcl; |
| 263 | 263 | int bTk; |
| 264 | 264 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -253,11 +253,11 @@ | |
| 253 | ** information needed to display the changes to |
| 254 | ** FILE caused by the most recent merge. FILE must |
| 255 | ** be a pathname relative to the root of the check-out. |
| 256 | ** --tk Bring up a Tcl/Tk GUI that shows the changes |
| 257 | ** associated with the most recent merge. |
| 258 | ** |
| 259 | */ |
| 260 | void merge_info_cmd(void){ |
| 261 | const char *zCnt; |
| 262 | const char *zTcl; |
| 263 | int bTk; |
| 264 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -253,11 +253,11 @@ | |
| 253 | ** information needed to display the changes to |
| 254 | ** FILE caused by the most recent merge. FILE must |
| 255 | ** be a pathname relative to the root of the check-out. |
| 256 | ** --tk Bring up a Tcl/Tk GUI that shows the changes |
| 257 | ** associated with the most recent merge. |
| 258 | ** |
| 259 | */ |
| 260 | void merge_info_cmd(void){ |
| 261 | const char *zCnt; |
| 262 | const char *zTcl; |
| 263 | int bTk; |
| 264 |