Merge branch 'tr/rev-list-docs' into next
commit123fe51c8f560ef5179fda53f699294caa4c616d
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Aug 2008 00:10:19 +0000 (17 17:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Aug 2008 00:10:19 +0000 (17 17:10 -0700)
tree2f530361a809a7f31c6e133dced6e2b541e402d8
parentfcf35a3ebe1a05c0e35991d01c947494e4c835ad
parentd266a988456fcaab9918eae39f5faf8dcb20cb26
Merge branch 'tr/rev-list-docs' into next

* tr/rev-list-docs:
  Documentation: rev-list-options: move --simplify-merges documentation

Conflicts:
Documentation/rev-list-options.txt
Documentation/rev-list-options.txt