Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern...
[git] / refs /
drwxr-xr-x   ..
-rw-r--r-- 98789 files-backend.c
-rw-r--r-- 6421 refs-internal.h