Documentation/git-merge.txt: Partial rewrite of How Merge Works
[git] / RelNotes
1 Documentation/RelNotes-1.6.0.txt