diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-05-14 09:31:45 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-05-14 09:31:45 +0000 |
| commit | c12b5c4d7394060774bb729ec3bf03d1218f4efd (patch) | |
| tree | 29ebf9558499f601bb5a3af7f685a7f4007c7d5e /cova.html | |
| parent | 2023-05-14T09:15:01Z (diff) | |
| download | repos-c12b5c4d7394060774bb729ec3bf03d1218f4efd.tar.gz repos-c12b5c4d7394060774bb729ec3bf03d1218f4efd.tar.bz2 repos-c12b5c4d7394060774bb729ec3bf03d1218f4efd.zip | |
2023-05-14T09:30:01Z
Diffstat (limited to 'cova.html')
| -rw-r--r-- | cova.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cova.html b/cova.html index 9ba25e4c58b2..bd29ad2796d5 100644 --- a/cova.html +++ b/cova.html @@ -46,7 +46,7 @@ </pre></td></tr> <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>From https://github.com/cova-fe/cova-overlay </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + ce53bc0...4686c05 main -> origin/main (forced update) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + 4686c05...1c59ef0 main -> origin/main (forced update) </pre></td></tr> <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>hint: You have divergent branches and need to specify how to reconcile them. </pre></td></tr> |