diff options
| author | Demetr Starshov <dstarshov@google.com> | 2020-08-11 17:57:10 -0700 |
|---|---|---|
| committer | Demetr Starshov <dstarshov@google.com> | 2020-08-26 18:39:38 -0700 |
| commit | e60ea7324f37bd0a1086e27fad52ecc5232e9c06 (patch) | |
| tree | 164c49cee87c8538358d29e09f000cb0aac5fe86 /lib | |
| parent | 86aa6deff4b452881876c78aaab09ddbb5c7531b (diff) | |
| download | jgit-e60ea7324f37bd0a1086e27fad52ecc5232e9c06.tar.gz jgit-e60ea7324f37bd0a1086e27fad52ecc5232e9c06.zip | |
ResolveMerger: Adding test cases for GITLINK merge
Add test cases which cover content-merge resolve logic.
Git clients try to agressively merge blobs by content, but GITLINK types
of entries can't be merged with each other or with blobs. This change
ensures all possible permutations which can trigger blob and GITLINK
content merge are covered.
Signed-off-by: Demetr Starshov <dstarshov@google.com>
Change-Id: I7e83a28a14d4d2f9e0ba2b1cffbf3224fb7f3fef
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions