Differences From Artifact [76734fd571]:

• File src/default_css.txt — part of check-in [55ab522cee] at 2018-12-27 19:39:21 on branch trunk — Show cherrypick merges on the default timeline. Disable the display of cherrypicks using the "ncp" query parameter. Currently, the only display difference between a normal merge and a cherrypick merges is in the final horizontal segment of the merge line as it moves into the child node. More work is needed on the display logic. (user: drh size: 12997)

To Artifact [45fbb8c7a8]:

• File src/default_css.txt — part of check-in [236586d6f2] at 2018-12-27 19:55:42 on branch trunk — Attempt to draw the entire length of a cherrypick merge line using a dashed line. (user: drh size: 13029)

170
171
172
173
174
175
176

177
178
179
180
181
182
183

}
.tl-arrow.cherrypick.r {
  border-left: 3px solid #000;
}
.tl-line.cherrypick {
  width: 0px;
  border-top: 1px dashed #000;

  background: #fff;
}
.tl-arrow.warp {
  margin-left: 1px;
  border-width: 3px 0;
  border-left: 7px solid #600000;
}

>

170
171
172
173
174
175
176
177
178
179
180
181
182
183
184

}
.tl-arrow.cherrypick.r {
  border-left: 3px solid #000;
}
.tl-line.cherrypick {
  width: 0px;
  border-top: 1px dashed #000;
  border-left: 1px dashed #000;
  background: #fff;
}
.tl-arrow.warp {
  margin-left: 1px;
  border-width: 3px 0;
  border-left: 7px solid #600000;
}