Adding Git merge diagram