revert: add "--strategy" option to choose merge strategy
[git/dscho.git] / RelNotes
blob00e77229ddadcb8a13b10b693a96bd76a4cb9f33
1 Documentation/RelNotes-1.7.1.txt