git-merge: refactor option parsing
[git] / RelNotes
1 Documentation/RelNotes-1.5.4.txt