Robert Collins 1873b98a8f Make config updates work with rebased branches.
Derived infrastructure deployments may well live as a set of rebased
patches floating on the upstream infrastructure. Simple 'pull -q' will
conflict if the reference branch is rebased.

Change-Id: I8127bb6305208879957c01e1c81b6329d74b27bf
2013-08-31 09:48:14 +12:00
..
2013-01-02 19:05:59 +00:00
2013-08-02 13:22:47 -07:00
2013-08-16 20:46:17 -07:00
2012-11-12 18:58:07 +00:00
2013-05-17 17:21:21 +00:00
2013-05-20 20:40:03 +00:00
2012-11-10 23:50:17 +00:00