global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-25 10:03:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge-resolve: avoid dashed call

Browse Source 
We started deprecating the dashed form a long time ago, advertising the
fact that dashed invocations of Git commands are deprecated for several
major versions.

Yet we still used them ourselves.

With ashes on our heads, we now start to finally get rid of those calls.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2016-11-29 11:40:55 +01:00
parent 8aaf1396c1
commit 5e8dbb9124
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge-resolve.sh
View File

@@ -45,7 +45,7 @@ then
exit 0
else
echo "Simple merge failed, trying Automatic merge."
if git-merge-index -o git-merge-one-file -a
if git merge-index -o git-merge-one-file -a
then
exit 0
else