Code

Merge tool#6

Code

Merged

lollolong merged 5 commits intomasterlollolong/gxt2:masterfrom merge-toollollolong/gxt2:merge-toolCopy head branch name to clipboardJun 7, 2024

+227-2

Commits

Commits on Jun 7, 2024

• base project structure for gxt2merge

  lollolong

  committed
  c8ea03e

  Copy full SHA for c8ea03e

• CFile::SetData use insert instead of copy operator

  lollolong

  committed
  46e3c19

  Copy full SHA for 46e3c19

• implement some basic merging logic for cli tool

  lollolong

  committed
  a86bdd0

  Copy full SHA for a86bdd0

• remove unneccessary SetData call on loading

  lollolong

  committed
  d53869b

  Copy full SHA for d53869b

• Update gxt2merge.cpp

  lollolong

  committed
  ba598db

  Copy full SHA for ba598db