[PATCH/RFC 1/6] Documentation: clarify one-line description for merge

The 'git merge' command is generally not used to tie completely independent projects together (though it can be used to do that) but to reconcile branches of development that may have diverged. Try to make this clearer in its one-line description.

Cc: Petr Baudis <pasky@suse.cz>
Cc: Junio C Hamano <gitster@pobox.com>
Cc: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
I am not sure this is an improvement at all.  Mostly I wanted to
convey the idea of code forks being reconciled, but the resulting
phrase is not nearly as nice.

 Documentation/git-merge.txt |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)