1 From: author@payflex.com
3 Subject: [cbas] topic1 branch updated. $new_commit_hash
4 X-Git-Refname: refs/heads/topic1
6 X-Git-Oldrev: $old_commit_hash
7 X-Git-Newrev: $new_commit_hash
9 The branch, topic1 has been updated
10 via $new_commit_hash (commit)
11 from $old_commit_hash (commit)
13 Those revisions listed above that are new to this repository have
14 not appeared on any other notification email; so we list those
15 revisions in full, below.
17 - Log -----------------------------------------------------------------
18 commit $new_commit_hash
19 Merge: $old_commit_hash $second_stable_hash
20 Author: A U Thor <author@example.com>
21 Date: $new_commit_date
23 Merge branch 'stable' into topic1
28 -----------------------------------------------------------------------
34 3 files changed, 3 insertions(+), 3 deletions(-)
37 index a67d715..01a17ba 100644
41 -merge in stable with conflict on topic1
42 +merge in stable with conflict 2 merged topic1
44 index 1c043c5..96d4816 100644
49 +merge in stable with conflict 2
51 index 1c043c5..96d4816 100644
56 +merge in stable with conflict 2