diff options
Diffstat (limited to 'trolltoo.txt')
-rw-r--r-- | trolltoo.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/trolltoo.txt b/trolltoo.txt index f4bde928c53d..622928df47e5 100644 --- a/trolltoo.txt +++ b/trolltoo.txt @@ -13,6 +13,7 @@ 'status': 'unofficial'} $ pmaint sync trolltoo WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing trolltoo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing trolltoo *** synced trolltoo * Sync succeeded $ git log --format=%ci -1 |