Documentation: merge: move configuration section to end
commit35e9d6303c15faf01fc9551d5ed648564dcd4014
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 23 Jan 2010 09:26:57 +0000 (23 03:26 -0600)
committerThomas Rast <trast@student.ethz.ch>
Sun, 24 Jan 2010 12:57:42 +0000 (24 13:57 +0100)
tree254787d75772682e471ce1a72258c9db8110b7ac
parent2d0f686c44bfb7055b317d178b703078b76dcc4f
Documentation: merge: move configuration section to end

Configuration and environment variables belong to the back matter
of a manual page.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Documentation/git-merge.txt