diff options
author | 2024-04-09 11:18:23 +0000 | |
---|---|---|
committer | 2024-04-09 11:18:23 +0000 | |
commit | 86eb6ebb3e26cb4ccf6f8402b8e57c27664eda3e (patch) | |
tree | 6eec77863d15f623a11d03ee7d69180145e96138 /bubba.html | |
parent | 2024-04-09T11:00:00Z (diff) | |
download | repos-86eb6ebb3e26cb4ccf6f8402b8e57c27664eda3e.tar.gz repos-86eb6ebb3e26cb4ccf6f8402b8e57c27664eda3e.tar.bz2 repos-86eb6ebb3e26cb4ccf6f8402b8e57c27664eda3e.zip |
2024-04-09T11:15:00Z
Diffstat (limited to 'bubba.html')
-rw-r--r-- | bubba.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bubba.html b/bubba.html index 227a5d0f0271..b2ea42aae761 100644 --- a/bubba.html +++ b/bubba.html @@ -44,7 +44,7 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>From https://github.com/gordonb3/bubba-overlay </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + aaa8a6e...daa22a4 master -> origin/master (forced update) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + daa22a4...bf8d427 master -> origin/master (forced update) </pre></td></tr> <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>hint: You have divergent branches and need to specify how to reconcile them. </pre></td></tr> |