Simple automatic merge

---

$ git checkout master

• Merge the feature into master.

$ git merge featurex
Merge made by the 'recursive' strategy.
 A.txt |    1 +
 1 file changed, 1 insertion(+)

$ gitk --all