/
snap
/
gh
/
502
/
usr
/
lib
/
git-core
/
/snap/gh/502/usr/lib/git-core
mkdir
upload
Name
Size
Mode
Actions
mergetools/
-
0755
rm
git
2351792
0755
edit
dl
rm
git-add
2351792
0755
edit
dl
rm
git-add--interactive
43919
0755
edit
dl
rm
git-am
2351792
0755
edit
dl
rm
git-annotate
2351792
0755
edit
dl
rm
git-apply
2351792
0755
edit
dl
rm
git-archive
2351792
0755
edit
dl
rm
git-bisect
14444
0755
edit
dl
rm
git-bisect--helper
2351792
0755
edit
dl
rm
git-blame
2351792
0755
edit
dl
rm
git-branch
2351792
0755
edit
dl
rm
git-bundle
2351792
0755
edit
dl
rm
git-cat-file
2351792
0755
edit
dl
rm
git-check-attr
2351792
0755
edit
dl
rm
git-check-ignore
2351792
0755
edit
dl
rm
git-check-mailmap
2351792
0755
edit
dl
rm
git-check-ref-format
2351792
0755
edit
dl
rm
git-checkout
2351792
0755
edit
dl
rm
git-checkout-index
2351792
0755
edit
dl
rm
git-cherry
2351792
0755
edit
dl
rm
git-cherry-pick
2351792
0755
edit
dl
rm
git-clean
2351792
0755
edit
dl
rm
git-clone
2351792
0755
edit
dl
rm
git-column
2351792
0755
edit
dl
rm
git-commit
2351792
0755
edit
dl
rm
git-commit-tree
2351792
0755
edit
dl
rm
git-config
2351792
0755
edit
dl
rm
git-count-objects
2351792
0755
edit
dl
rm
git-credential
2351792
0755
edit
dl
rm
git-credential-cache
1308912
0755
edit
dl
rm
git-credential-cache--daemon
1317200
0755
edit
dl
rm
git-credential-store
1317168
0755
edit
dl
rm
git-daemon
1321328
0755
edit
dl
rm
git-describe
2351792
0755
edit
dl
rm
git-diff
2351792
0755
edit
dl
rm
git-diff-files
2351792
0755
edit
dl
rm
git-diff-index
2351792
0755
edit
dl
rm
git-diff-tree
2351792
0755
edit
dl
rm
git-difftool
2351792
0755
edit
dl
rm
git-difftool--helper
2244
0755
edit
dl
rm
git-fast-export
2351792
0755
edit
dl
rm
git-fast-import
1346416
0755
edit
dl
rm
git-fetch
2351792
0755
edit
dl
rm
git-fetch-pack
2351792
0755
edit
dl
rm
git-filter-branch
15534
0755
edit
dl
rm
git-fmt-merge-msg
2351792
0755
edit
dl
rm
git-for-each-ref
2351792
0755
edit
dl
rm
git-format-patch
2351792
0755
edit
dl
rm
git-fsck
2351792
0755
edit
dl
rm
git-fsck-objects
2351792
0755
edit
dl
rm
git-gc
2351792
0755
edit
dl
rm
git-get-tar-commit-id
2351792
0755
edit
dl
rm
git-grep
2351792
0755
edit
dl
rm
git-hash-object
2351792
0755
edit
dl
rm
git-help
2351792
0755
edit
dl
rm
git-http-backend
1317424
0755
edit
dl
rm
git-http-fetch
1358608
0755
edit
dl
rm
git-http-push
1370912
0755
edit
dl
rm
git-imap-send
1367216
0755
edit
dl
rm
git-index-pack
2351792
0755
edit
dl
rm
git-init
2351792
0755
edit
dl
rm
git-init-db
2351792
0755
edit
dl
rm
git-instaweb
18546
0755
edit
dl
rm
git-interpret-trailers
2351792
0755
edit
dl
rm
git-log
2351792
0755
edit
dl
rm
git-ls-files
2351792
0755
edit
dl
rm
git-ls-remote
2351792
0755
edit
dl
rm
git-ls-tree
2351792
0755
edit
dl
rm
git-mailinfo
2351792
0755
edit
dl
rm
git-mailsplit
2351792
0755
edit
dl
rm
git-merge
2351792
0755
edit
dl
rm
git-merge-base
2351792
0755
edit
dl
rm
git-merge-file
2351792
0755
edit
dl
rm
git-merge-index
2351792
0755
edit
dl
rm
git-merge-octopus
2477
0755
edit
dl
rm
git-merge-one-file
3707
0755
edit
dl
rm
git-merge-ours
2351792
0755
edit
dl
rm
git-merge-recursive
2351792
0755
edit
dl
rm
git-merge-resolve
944
0755
edit
dl
rm
git-merge-subtree
2351792
0755
edit
dl
rm
git-merge-tree
2351792
0755
edit
dl
rm
git-mergetool
10303
0755
edit
dl
rm
git-mergetool--lib
8869
0644
edit
dl
rm
git-mktag
2351792
0755
edit
dl
rm
git-mktree
2351792
0755
edit
dl
rm
git-mv
2351792
0755
edit
dl
rm
git-name-rev
2351792
0755
edit
dl
rm
git-notes
2351792
0755
edit
dl
rm
git-pack-objects
2351792
0755
edit
dl
rm
git-pack-redundant
2351792
0755
edit
dl
rm
git-pack-refs
2351792
0755
edit
dl
rm
git-parse-remote
2650
0644
edit
dl
rm
git-patch-id
2351792
0755
edit
dl
rm
git-prune
2351792
0755
edit
dl
rm
git-prune-packed
2351792
0755
edit
dl
rm
git-pull
2351792
0755
edit
dl
rm
git-push
2351792
0755
edit
dl
rm
git-quiltimport
3596
0755
edit
dl
rm
git-read-tree
2351792
0755
edit
dl
rm
git-rebase
17291
0755
edit
dl
rm
git-rebase--am
2680
0644
edit
dl
rm
git-rebase--helper
2351792
0755
edit
dl
rm
git-rebase--interactive
28932
0644
edit
dl
rm
git-rebase--merge
4096
0644
edit
dl
rm
git-receive-pack
2351792
0755
edit
dl
rm
git-reflog
2351792
0755
edit
dl
rm
git-remote
2351792
0755
edit
dl
rm
git-remote-ext
2351792
0755
edit
dl
rm
git-remote-fd
2351792
0755
edit
dl
rm
git-remote-ftp
1370880
0755
edit
dl
rm
git-remote-ftps
1370880
0755
edit
dl
rm
git-remote-http
1370880
0755
edit
dl
rm
git-remote-https
1370880
0755
edit
dl
rm
git-remote-testsvn
1329520
0755
edit
dl
rm
git-repack
2351792
0755
edit
dl
rm
git-replace
2351792
0755
edit
dl
rm
git-request-pull
3698
0755
edit
dl
rm
git-rerere
2351792
0755
edit
dl
rm
git-reset
2351792
0755
edit
dl
rm
git-rev-list
2351792
0755
edit
dl
rm
git-rev-parse
2351792
0755
edit
dl
rm
git-revert
2351792
0755
edit
dl
rm
git-rm
2351792
0755
edit
dl
rm
git-send-pack
2351792
0755
edit
dl
rm
git-sh-i18n
2355
0644
edit
dl
rm
git-sh-i18n--envsubst
1304816
0755
edit
dl
rm
git-sh-prompt
16379
0644
edit
dl
rm
git-sh-setup
9256
0644
edit
dl
rm
git-shell
1309008
0755
edit
dl
rm
git-shortlog
2351792
0755
edit
dl
rm
git-show
2351792
0755
edit
dl
rm
git-show-branch
2351792
0755
edit
dl
rm
git-show-index
1304816
0755
edit
dl
rm
git-show-ref
2351792
0755
edit
dl
rm
git-stage
2351792
0755
edit
dl
rm
git-stash
15486
0755
edit
dl
rm
git-status
2351792
0755
edit
dl
rm
git-stripspace
2351792
0755
edit
dl
rm
git-submodule
23941
0755
edit
dl
rm
git-submodule--helper
2351792
0755
edit
dl
rm
git-subtree
16495
0755
edit
dl
rm
git-symbolic-ref
2351792
0755
edit
dl
rm
git-tag
2351792
0755
edit
dl
rm
git-unpack-file
2351792
0755
edit
dl
rm
git-unpack-objects
2351792
0755
edit
dl
rm
git-update-index
2351792
0755
edit
dl
rm
git-update-ref
2351792
0755
edit
dl
rm
git-update-server-info
2351792
0755
edit
dl
rm
git-upload-archive
2351792
0755
edit
dl
rm
git-upload-pack
1317120
0755
edit
dl
rm
git-var
2351792
0755
edit
dl
rm
git-verify-commit
2351792
0755
edit
dl
rm
git-verify-pack
2351792
0755
edit
dl
rm
git-verify-tag
2351792
0755
edit
dl
rm
git-web--browse
4401
0755
edit
dl
rm
git-whatchanged
2351792
0755
edit
dl
rm
git-worktree
2351792
0755
edit
dl
rm
git-write-tree
2351792
0755
edit
dl
rm
Edit:
/snap/gh/502/usr/lib/git-core/git-merge-resolve
(944B)
#!/bin/sh # # Copyright (c) 2005 Linus Torvalds # Copyright (c) 2005 Junio C Hamano # # Resolve two trees, using enhanced multi-base read-tree. # The first parameters up to -- are merge bases; the rest are heads. bases= head= remotes= sep_seen= for arg do case ",$sep_seen,$head,$arg," in *,--,) sep_seen=yes ;; ,yes,,*) head=$arg ;; ,yes,*) remotes="$remotes$arg " ;; *) bases="$bases$arg " ;; esac done # Give up if we are given two or more remotes -- not handling octopus. case "$remotes" in ?*' '?*) exit 2 ;; esac # Give up if this is a baseless merge. if test '' = "$bases" then exit 2 fi git update-index -q --refresh git read-tree -u -m --aggressive $bases $head $remotes || exit 2 echo "Trying simple merge." if result_tree=$(git write-tree 2>/dev/null) then exit 0 else echo "Simple merge failed, trying Automatic merge." if git merge-index -o git-merge-one-file -a then exit 0 else exit 1 fi fi
Save
cmd:
run