add1.c is commited to greet
Merge branch 'master' into greet
interactive commits
Merge branch 'master' into greet
new.c conflict added
Merge branch 'master' into greet
new.c changed from greet
commited
done commit
ok done