Display current git branch
java path
ctrl+tab
merge
Merge branch 'master' of https://github.com/artss/dotfiles

Conflicts:
	etc/env.d/60java
packages list