merge-recursive: demonstrate an incorrect conflict with submodule
[git/git-svn.git] / RelNotes
blob3da01a5622c0b6c581a701dbb5421fb84e87df80
1 Documentation/RelNotes-1.7.2.txt