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_abbrev Merge branch 'stable' into topic1
11 from $old_commit_abbrev move topic1
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 -----------------------------------------------------------------
19 commit $new_commit_hash
20 Merge: $old_commit_hash $second_stable_hash
21 Author: A U Thor <author@example.com>
22 Date: $new_commit_date
24 Merge branch 'stable' into topic1
31 index a67d715,96d4816..01a17ba
34 @@@ -1,1 -1,1 +1,1 @@@
35 - merge in stable with conflict on topic1
36 -merge in stable with conflict 2
37 ++merge in stable with conflict 2 merged topic1
39 -----------------------------------------------------------------------
45 3 files changed, 3 insertions(+), 3 deletions(-)