Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

patch for korean, from YongSung Yoon

  • Loading branch information...
commit e129bd4f8d1b0ea3db73e16e32f446fac070e6c0 1 parent 0c7ab84
@lethee lethee authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  index-ko.html
View
2  index-ko.html
@@ -267,7 +267,7 @@ <h3 id="merge">Merge</h3>
뿌리가 되는 커밋(<em>b325c</em>)을 가지고
<a href='http://en.wikipedia.org/wiki/Three-way_merge'>3-way Merge</a>를
수행합니다. Merge한 결과는 작업 디렉토리와 Stage 영역에 저장되며 부모가
- 여럿인 새 커밋(<em>33104</em>) 만듭니다.
+ 여럿(<em>33104</em>, <em>ed489</em>)인 새 커밋을 만듭니다.
</p>
<div class="center"><img src='merge.svg.png'></div>
Please sign in to comment.
Something went wrong with that request. Please try again.