BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~98ee606e6b0fe965:
  'Auto converge rename'
configure.in:
  Auto merged
sql/sql_yacc.yy:
  Manually merged.