diff options
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index d79fc84029..308eafd1d3 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -6,7 +6,6 @@ # . git-sh-setup -. git-sh-i18n LF=' ' |