DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 01:25:50 +0000 (01:25 +0000)]
am: 8e6c809370  -s ours

* commit '8e6c8093709b144e69efb8c6bff4be50729f3c25':
  DO NOT MERGE. Use resolved path for both checking and opening.


Trivial merge