summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
Diffstat (limited to 'git-resolve-script')
-rwxr-xr-x[-rw-r--r--]git-resolve-script0
1 files changed, 0 insertions, 0 deletions
diff --git a/git-resolve-script b/git-resolve-script
index 0b04a5f..0b04a5f 100644..100755
--- a/git-resolve-script
+++ b/git-resolve-script