Fossil SCM

Healed inadvertent fork of trunk

wyoung 2020-01-08 18:30 trunk merge
Commit 636b47f9a2ba1540c0b6d1e666f0845cec4f150089c45257695465076b0963cb
1 file changed +1
--- www/checkin_names.wiki
+++ www/checkin_names.wiki
@@ -9,10 +9,11 @@
99
<li> Cryptographic hash prefix
1010
<li> Tag or branchname
1111
<li> Timestamp: <i>YYYY-MM-DD HH:MM:SS</i>
1212
<li> <i>tag-name</i> <big><b>:</b></big> <i>timestamp</i>
1313
<li> <b>root :</b> <i>branchname</i>
14
+<li> <b>merge-in :</b> <i>branchname</i>
1415
<li> Special names:
1516
<ul>
1617
<li> <b>tip</b>
1718
<li> <b>current</b>
1819
<li> <b>next</b>
1920
--- www/checkin_names.wiki
+++ www/checkin_names.wiki
@@ -9,10 +9,11 @@
9 <li> Cryptographic hash prefix
10 <li> Tag or branchname
11 <li> Timestamp: <i>YYYY-MM-DD HH:MM:SS</i>
12 <li> <i>tag-name</i> <big><b>:</b></big> <i>timestamp</i>
13 <li> <b>root :</b> <i>branchname</i>
 
14 <li> Special names:
15 <ul>
16 <li> <b>tip</b>
17 <li> <b>current</b>
18 <li> <b>next</b>
19
--- www/checkin_names.wiki
+++ www/checkin_names.wiki
@@ -9,10 +9,11 @@
9 <li> Cryptographic hash prefix
10 <li> Tag or branchname
11 <li> Timestamp: <i>YYYY-MM-DD HH:MM:SS</i>
12 <li> <i>tag-name</i> <big><b>:</b></big> <i>timestamp</i>
13 <li> <b>root :</b> <i>branchname</i>
14 <li> <b>merge-in :</b> <i>branchname</i>
15 <li> Special names:
16 <ul>
17 <li> <b>tip</b>
18 <li> <b>current</b>
19 <li> <b>next</b>
20

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button