U    npc/other/turbotrack/Normal_Solo.txt
U    npc/other/turbotrack/Expert_4.txt
U    npc/other/turbotrack/Normal_4.txt
U    npc/other/turbotrack/Expert_16.txt
U    npc/other/turbotrack/Expert_8.txt
U    npc/other/turbotrack/Normal_16.txt
U    npc/other/turbotrack/Normal_8.txt
A    npc/merchants/diamond.txt
U    npc/scripts_renewal.conf
U    npc/scripts_athena.conf
U    npc/jobs/3-1/archbishop.txt
U    npc/mobs/dungeons/lhz_dun.txt
U    npc/mobs/dungeons/dic_dun.txt
A    npc/mobs/dungeons/mal_dun.txt
A    npc/mobs/dungeons/dew_dun.txt
A    npc/mobs/dungeons/ma_dun.txt
U    npc/mobs/dungeons/iz_dun.txt
A    npc/mobs/fields/malaya.txt
A    npc/mobs/fields/dewata.txt
A    npc/mobs/fields/bifrost.txt
U    conf/log_athena.conf
D    db/exp_homun.txt
D    db/exp_guild.txt
   C db/exp.txt
A    db/re/exp_homun.txt
U    db/re/item_db.txt
A    db/re/exp_guild.txt
A    db/re/exp.txt
A    db/pre-re/exp_homun.txt
U    db/pre-re/item_db.txt
A    db/pre-re/exp_guild.txt
A    db/pre-re/exp.txt
U    db/pet_db.txt
U    src/char_sql/int_guild.c
G    src/map/atcommand.c
U    src/map/script.c
G    src/map/battle.c
U    src/map/skill.c
U    src/map/vending.c
U    src/map/storage.c
U    src/map/buyingstore.c
U    src/map/mob.c
U    src/map/clif.c
U    src/map/homunculus.c
U    src/map/guild.c
U    src/map/intif.c
U    src/map/npc.c
U    src/map/trade.c
U    src/map/party.c
U    src/map/pc.c
U    src/map/pc.h
U    src/map/log.c
U    src/map/mail.c
U    src/map/log.h
U    src/map/pet.c
U    src/map/chrif.c
U    sql-files/upgrade_svn13583.sql
U    sql-files/upgrade_svn11388.sql
U    sql-files/upgrade_svn13963.sql
U    sql-files/upgrade_svn13960_questlog.sql
A    sql-files/upgrade_svn15420_log.sql
U    sql-files/upgrade_svn14242.sql
U    sql-files/upgrade_svn13390.sql
U    sql-files/upgrade_svn12581.sql
U    sql-files/upgrade_svn14085.sql
U    sql-files/upgrade_svn12368.sql
U    sql-files/mob_db.sql
U    sql-files/logs.sql
U    sql-files/upgrade_svn11106.sql
U    sql-files/upgrade_svn13117_char.sql
U    sql-files/upgrade_svn14036.sql
U    sql-files/upgrade_svn12294.sql
Updated to revision 15439.
Summary of conflicts:
  Tree conflicts: 1