merge-recursive: improve handling for rename/rename(2to1) conflicts
[gitweb.git] / gitweb / static / js /
drwxr-xr-x   parent (dest: gitweb/static; base: bbafc9c44ae7109f636772350934b3c5d747da44)
-rw-r--r-- 1011 README
-rw-r--r-- 11424 adjust-timezone.js
-rw-r--r-- 19329 blame_incremental.js
-rw-r--r-- 1278 javascript-detection.js
drwxr-xr-x - lib