Log Message:
Update to 1.6.1
* Minor textual fixes in the config manual page
* Do a better job at drawing merge lines. Ugly cross over lines could be
  generated if branches had the same parent. Now they are moved to the right
  (or bottom)