diff options
Diffstat (limited to 'python.txt')
| -rw-r--r-- | python.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python.txt b/python.txt index a2dfe1f373e7..a0cf6365aee4 100644 --- a/python.txt +++ b/python.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/python.git'}], 'status': 'official'} $ pmaint sync python +*** syncing python 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 python *** synced python * Sync succeeded $ git log --format=%ci -1 |