5 Commits

Include renames

Author	SHA1	Message	Date
warriorstar-orionandGitHub	8898e3ab6c	mapmerge: one last fix for diff size (#22746)	2023-10-06 19:46:50 +01:00
warriorstar-orionandGitHub	a0019cfac6	mapmerge: Improve three-way merge output. (#22362) ... * Improve three-way merge output. Prior to this PR, even if the three way merge found a matching tile definition from one side of the merge, it would receive a new key. Now an attempt is made to also preserve the key from that side of the merge when possible. * lewc review	2023-09-19 16:53:08 +01:00
ContrabangandGitHub	899f259ef4	updates mapmerge (#21898)	2023-08-05 02:04:16 -05:00
3 people	4f5c3376e3	Updates tools to include mapmerge hooks and merge drivers, plus more (#18034) ... * bumps tools to modern versions, adds DMM merge driver hooks for automatic map merging * mapping guidelines update * Update .github/CONTRIBUTING.md Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> * aa review * these somehow got ignored? force adding * Apply suggestions from code review Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>	2022-06-21 23:53:19 +01:00
Fox McCloud	7d423acc61	Implements Newer Version of Mapmerge	2019-03-17 22:46:24 -04:00