tg-update.sh: there be octopuses here!
commit73cbb5b8e182a358fd562b412a3d70a762804d3a
authorKyle J. McKay <mackyle@gmail.com>
Mon, 23 Jan 2017 02:46:21 +0000 (22 18:46 -0800)
committerKyle J. McKay <mackyle@gmail.com>
Mon, 23 Jan 2017 02:46:21 +0000 (22 18:46 -0800)
tree85ea82093b2583f16339cc5f0fb2ff750f0e5928
parent9f567f288f656aaa39e42a1471d03251d17ce0e7
tg-update.sh: there be octopuses here!

The commonly sighed ordinary beast:

  Merge made by the 'trivial aggressive automatic octopus' strategy.

and its much rarer cousin:

  Merge made by the 'trivial aggressive octopus' strategy.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
tg-update.sh