Fossil SCM
Add missing word in the help text for 'merge'.
Commit
bdc6bb1cfb2011da23968074c9e0f7d3a22e14891f8eb0c3f14b278e5335b35b
Parent
3a39ae4c87773ac…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -687,11 +687,11 @@ | ||
| 687 | 687 | ** -K|--keep-merge-files On merge conflict, retain the temporary files |
| 688 | 688 | ** used for merging, named *-baseline, *-original, |
| 689 | 689 | ** and *-merge. |
| 690 | 690 | ** -n|--dry-run Do not actually change files on disk |
| 691 | 691 | ** --nosync Do not auto-sync prior to merging |
| 692 | -** --noundo Do not changes in the undo log | |
| 692 | +** --noundo Do not record changes in the undo log | |
| 693 | 693 | ** -v|--verbose Show additional details of the merge |
| 694 | 694 | */ |
| 695 | 695 | void merge_cmd(void){ |
| 696 | 696 | int vid; /* Current version "V" */ |
| 697 | 697 | int mid; /* Version we are merging from "M" */ |
| 698 | 698 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -687,11 +687,11 @@ | |
| 687 | ** -K|--keep-merge-files On merge conflict, retain the temporary files |
| 688 | ** used for merging, named *-baseline, *-original, |
| 689 | ** and *-merge. |
| 690 | ** -n|--dry-run Do not actually change files on disk |
| 691 | ** --nosync Do not auto-sync prior to merging |
| 692 | ** --noundo Do not changes in the undo log |
| 693 | ** -v|--verbose Show additional details of the merge |
| 694 | */ |
| 695 | void merge_cmd(void){ |
| 696 | int vid; /* Current version "V" */ |
| 697 | int mid; /* Version we are merging from "M" */ |
| 698 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -687,11 +687,11 @@ | |
| 687 | ** -K|--keep-merge-files On merge conflict, retain the temporary files |
| 688 | ** used for merging, named *-baseline, *-original, |
| 689 | ** and *-merge. |
| 690 | ** -n|--dry-run Do not actually change files on disk |
| 691 | ** --nosync Do not auto-sync prior to merging |
| 692 | ** --noundo Do not record changes in the undo log |
| 693 | ** -v|--verbose Show additional details of the merge |
| 694 | */ |
| 695 | void merge_cmd(void){ |
| 696 | int vid; /* Current version "V" */ |
| 697 | int mid; /* Version we are merging from "M" */ |
| 698 |