Don\'t create tombstone directory. am: cb9625cbe5 am: 99b8a56616 am: 0cf99e2b61 am: 338f1802ee am: 3ee4a0be2a am: 7f0d750b2d am: 41f72f0537 am: f740908c5b  -s ours
am: 280cc0a639

* commit '280cc0a639f7fee65dce13f67312265b5ddb741b':
  Don't create tombstone directory.