Commits

Branch selector

 master

User selector

All users

Datepicker

All time

Commit History

Commits on Nov 18, 2024

• (:automated_merge:) Merge commit '7912efa7c9cb0da1bb728b8cbfc6faa4879ecd06'

  GerHobbelt

  committed
  d92db03

  Copy full SHA for d92db03

Commits on Nov 15, 2024

• (:automated_merge:) Merge commit '4b75d7a16abcb010714e121a8107d2e6db5b73a0'

  GerHobbelt

  committed
  5834c20

  Copy full SHA for 5834c20

Commits on Nov 3, 2024

• (:automated_merge:) Merge commit 'aa87c5e78fdeb35ba4dd5a19493e954388df65f9'

  GerHobbelt

  committed
  ef511b9

  Copy full SHA for ef511b9

Commits on Jul 11, 2024

• ci: fix download error

  cubicdaiya

  committed
  7912efa

  Copy full SHA for 7912efa

• ci: update googletest to 1.14.0.

  cubicdaiya

  committed
  4b75d7a

  Copy full SHA for 4b75d7a

• Merge pull request cubicdaiya#18 from ZaychukAleksey/master

  Show description for aa87c5e
  cubicdaiya

  authored
  aa87c5e

  Copy full SHA for aa87c5e

Commits on Jun 30, 2024

• Merge remote-tracking branch 'remotes/wingunder/wingunder_dynamic_sizes'

  GerHobbelt

  committed
  c116666

  Copy full SHA for c116666

• fixes for latest cherrypicks.

  GerHobbelt

  committed
  e260ff9

  Copy full SHA for e260ff9

• Update Diff3.hpp

  Show description for 9536d22
  

  Jango73

  authored and

  GerHobbelt

  committed
  9536d22

  Copy full SHA for 9536d22

• Diff : enable a strict mode in uniPatch in order to fail if common sequences are not equal, in which case the original sequence is returned.

  

  Jango73

  authored and

  GerHobbelt

  committed
  91eb38a

  Copy full SHA for 91eb38a

• Diff3 conflict resolution

  Show description for dd3c6b4
  

  Jango73

  authored and

  GerHobbelt

  committed
  dd3c6b4

  Copy full SHA for dd3c6b4

• Add the Conflict class in order to store and mark conflict blocks in output sequence

  

  Jango73

  authored and

  GerHobbelt

  committed
  43db17b

  Copy full SHA for 43db17b

• Made DTL_SEPARATE_SIZE and DTL_CONTEXT_SIZE dynamic.

  Show description for 68f77ab
  

  wingunder

  authored and

  GerHobbelt

  committed
  68f77ab

  Copy full SHA for 68f77ab

• new to scons missed -std=c++17

  

  stribor

  authored and

  GerHobbelt

  committed
  286568f

  Copy full SHA for 286568f

• build tests using -std=c++17 since last previous change requires c++17

  

  stribor

  authored and

  GerHobbelt

  committed
  4e38d77

  Copy full SHA for 4e38d77

• use container size_type as size_t

  Show description for 1bf92e9
  

  stribor

  authored and

  GerHobbelt

  committed
  1bf92e9

  Copy full SHA for 1bf92e9

• fix compiler warnings

  Show description for 6d014a8
  

  cgzones

  authored and

  GerHobbelt

  committed
  6d014a8

  Copy full SHA for 6d014a8

• Merge remote-tracking branch 'remotes/bobk2824/bugfix-uninitialized-scalar'

  GerHobbelt

  committed
  ce7bca3

  Copy full SHA for ce7bca3

• Merge remote-tracking branch 'remotes/ZaychukAleksey/master'

  GerHobbelt

  committed
  bc80057

  Copy full SHA for bc80057

• fixes for monolithic build mode.

  GerHobbelt

  committed
  9dc0b65

  Copy full SHA for 9dc0b65

• Win32/MSVC porting fixes

  GerHobbelt

  committed
  b6126c8

  Copy full SHA for b6126c8

Commits on Jan 23, 2024

• Fix build with GCC 14.

  Show description for 7496ad1
  ZaychukAleksey

  authored
  7496ad1

  Copy full SHA for 7496ad1

Commits on Oct 14, 2022

• Fix uninitialized scalar errors reported by Coverity:

  Show description for 1abef53
  bobk2824

  committed
  1abef53

  Copy full SHA for 1abef53

Commits on Sep 9, 2022

• Merge tag 'v1.20'

  GerHobbelt

  committed
  62689d5

  Copy full SHA for 62689d5

Commits on Apr 11, 2022

• v1.20

  cubicdaiya

  committed
  cd45dd4

  Copy full SHA for cd45dd4

• test: update googletest.

  cubicdaiya

  committed
  946dc4c

  Copy full SHA for 946dc4c

• bugfix: fixed invalid offset in unified format difference when difference is too large.

  cubicdaiya

  committed
  ebd9a49

  Copy full SHA for ebd9a49

Commits on Mar 14, 2022

• fix MSVC2019 compiler error: provide the proper header file for open/read/clode/... APIs.

  GerHobbelt

  committed
  5f0f6bc

  Copy full SHA for 5f0f6bc

Commits on May 31, 2021

• doc: rm travis-ci.org link.

  cubicdaiya

  committed
  18e674e

  Copy full SHA for 18e674e

Commits on Apr 3, 2021

• doc: typo fixed.

  cubicdaiya

  committed
  0551c22

  Copy full SHA for 0551c22

• gitignore: added the new pattern.

  cubicdaiya

  committed
  32787c0

  Copy full SHA for 32787c0

• scons: print sentence is not available in python3.

  cubicdaiya

  committed
  ab0b64b

  Copy full SHA for ab0b64b

Commits on Feb 17, 2021

• Merge pull request cubicdaiya#10 from cubicdaiya/switch-github-actions

  Show description for 831aeec
  cubicdaiya

  authored
  831aeec

  Copy full SHA for 831aeec

• ci: switch to GitHub Actions.

  cubicdaiya

  committed
  ebbde69

  Copy full SHA for ebbde69

Commits on Sep 22, 2020

• Merge pull request cubicdaiya#7 from wlawski/custom-storage

  Show description for b83e617
  cubicdaiya

  authored
  b83e617

  Copy full SHA for b83e617

Pagination

Previous

Next