added tmp.txt
Merge branch 'master' of file:///home/per/git/myproj
modified tmp.txt
Merge remote-tracking branch 'local/master'