Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 022fe8f

Browse files
authored
feat(merge): automerge files with diff3 (isomorphic-git#837)
1 parent 6a7b6a0 commit 022fe8f

File tree

152 files changed

+438
-2439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+438
-2439
lines changed

__tests__/__fixtures__/test-_diffTree.git/COMMIT_EDITMSG

Lines changed: 0 additions & 9 deletions
This file was deleted.

__tests__/__fixtures__/test-_diffTree.git/HEAD

Lines changed: 0 additions & 1 deletion
This file was deleted.

__tests__/__fixtures__/test-_diffTree.git/ORIG_HEAD

Lines changed: 0 additions & 1 deletion
This file was deleted.

__tests__/__fixtures__/test-_diffTree.git/config

Lines changed: 0 additions & 7 deletions
This file was deleted.

__tests__/__fixtures__/test-_diffTree.git/description

Lines changed: 0 additions & 1 deletion
This file was deleted.

__tests__/__fixtures__/test-_diffTree.git/hooks/applypatch-msg.sample

Lines changed: 0 additions & 15 deletions
This file was deleted.

__tests__/__fixtures__/test-_diffTree.git/hooks/commit-msg.sample

Lines changed: 0 additions & 24 deletions
This file was deleted.

__tests__/__fixtures__/test-_diffTree.git/hooks/fsmonitor-watchman.sample

Lines changed: 0 additions & 114 deletions
This file was deleted.

__tests__/__fixtures__/test-_diffTree.git/hooks/post-update.sample

Lines changed: 0 additions & 8 deletions
This file was deleted.

__tests__/__fixtures__/test-_diffTree.git/hooks/pre-applypatch.sample

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)