opensource/tldr
3
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2026-09-24 23:11:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

git-merge: --abort mentions that it's for situations with conflicts

Browse Source
This commit is contained in:
Borek Bernard
2018-07-19 13:45:22 +05:30
committed by Agniva De Sarker
parent bade4c7c03
commit 9225a7b2d5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/common/git-merge.md
+1 -1
View File
@@ -14,6 +14,6 @@
`git merge --no-ff {{branch_name}}`
- Abort merge:
- Abort a merge in case of conflicts:
`git merge --abort`