Fossil SCM
warning message fix
Commit
b9fbfac5ff8523285fa2bdb33ebc91c1666f0495
Parent
2dc4d98e3baad8b…
1 file changed
+1
-1
+1
-1
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -1974,9 +1974,9 @@ | ||
| 1974 | 1974 | content_enable_dephantomize(1); |
| 1975 | 1975 | db_end_transaction(0); |
| 1976 | 1976 | } |
| 1977 | 1977 | if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){ |
| 1978 | 1978 | fossil_warning("***** WARNING: an ambiguous branch has occurred *****\n" |
| 1979 | - "use \"fossil leaves -multiple\" for more details."); | |
| 1979 | + "use \"fossil info\" for more details."); | |
| 1980 | 1980 | } |
| 1981 | 1981 | return nErr; |
| 1982 | 1982 | } |
| 1983 | 1983 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1974,9 +1974,9 @@ | |
| 1974 | content_enable_dephantomize(1); |
| 1975 | db_end_transaction(0); |
| 1976 | } |
| 1977 | if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){ |
| 1978 | fossil_warning("***** WARNING: an ambiguous branch has occurred *****\n" |
| 1979 | "use \"fossil leaves -multiple\" for more details."); |
| 1980 | } |
| 1981 | return nErr; |
| 1982 | } |
| 1983 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1974,9 +1974,9 @@ | |
| 1974 | content_enable_dephantomize(1); |
| 1975 | db_end_transaction(0); |
| 1976 | } |
| 1977 | if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){ |
| 1978 | fossil_warning("***** WARNING: an ambiguous branch has occurred *****\n" |
| 1979 | "use \"fossil info\" for more details."); |
| 1980 | } |
| 1981 | return nErr; |
| 1982 | } |
| 1983 |