merge-recursive: new function for better colliding conflict resolutions
[gitweb.git] / contrib / git-jump /
drwxr-xr-x   parent (dest: contrib; base: 37b65ce36bc8f79b5e8cf6f3addf586bd72f3352)
-rw-r--r-- 3465 README
-rwxr-xr-x 1599 git-jump