Fossil SCM
Fix a typo in an error message in the merge logic.
Commit
370a89c8328b4a67b77af33ae3393d33462797c4
Parent
4e3cd6ce4eca752…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -96,11 +96,11 @@ | ||
| 96 | 96 | pivot_set_secondary(db_column_int(&q,0)); |
| 97 | 97 | } |
| 98 | 98 | db_finalize(&q); |
| 99 | 99 | pid = pivot_find(); |
| 100 | 100 | if( pid<=0 ){ |
| 101 | - fossil_fatal("cannot find a common ancestor between the current" | |
| 101 | + fossil_fatal("cannot find a common ancestor between the current " | |
| 102 | 102 | "checkout and %s", g.argv[2]); |
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | if( !is_a_version(pid) ){ |
| 106 | 106 | fossil_fatal("not a version: record #%d", pid); |
| 107 | 107 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -96,11 +96,11 @@ | |
| 96 | pivot_set_secondary(db_column_int(&q,0)); |
| 97 | } |
| 98 | db_finalize(&q); |
| 99 | pid = pivot_find(); |
| 100 | if( pid<=0 ){ |
| 101 | fossil_fatal("cannot find a common ancestor between the current" |
| 102 | "checkout and %s", g.argv[2]); |
| 103 | } |
| 104 | } |
| 105 | if( !is_a_version(pid) ){ |
| 106 | fossil_fatal("not a version: record #%d", pid); |
| 107 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -96,11 +96,11 @@ | |
| 96 | pivot_set_secondary(db_column_int(&q,0)); |
| 97 | } |
| 98 | db_finalize(&q); |
| 99 | pid = pivot_find(); |
| 100 | if( pid<=0 ){ |
| 101 | fossil_fatal("cannot find a common ancestor between the current " |
| 102 | "checkout and %s", g.argv[2]); |
| 103 | } |
| 104 | } |
| 105 | if( !is_a_version(pid) ){ |
| 106 | fossil_fatal("not a version: record #%d", pid); |
| 107 |