diff options
Diffstat (limited to 'git-resolve-script')
| -rwxr-xr-x[-rw-r--r--] | git-resolve-script | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/git-resolve-script b/git-resolve-script index 0b04a5f6af..0b04a5f6af 100644..100755 --- a/git-resolve-script +++ b/git-resolve-script |