Add DiffMerge support in diff & merge.
Remove .orig files from ignore.
Add aliase & functions support git.