Merge branch 'en/sequencer-edit-upon-conflict-fix'
[git] / contrib / git-jump /
drwxr-xr-x   ..
-rw-r--r-- 3465 README
-rwxr-xr-x 1599 git-jump