Bash: fix $PATH construction.

Replace global $PATH to ensure correct order.
Git: commerge alias, merge options.

1. commerge: commit resolved conflict without editing message.
2. Do not open editor on successfull merge.
git-changelog script.