-
Notifications
You must be signed in to change notification settings - Fork 32
/
t2203-2.txt
45 lines (36 loc) · 1.17 KB
/
t2203-2.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
From: author@example.com
To: commits@list.com
Subject: [cbas] topic1 branch updated. $new_commit_hash
X-Git-Refname: refs/heads/topic1
X-Git-Reftype: branch
X-Git-Oldrev: $old_commit_hash
X-Git-Newrev: $new_commit_hash
The branch, topic1 has been updated
via $new_commit_abbrev Merge branch 'stable' into topic1
from $old_commit_abbrev move topic1
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit $new_commit_hash
Merge: $old_commit_abbrev $second_stable_abbrev
Author: A U Thor <author@example.com>
Date: $new_commit_date
Merge branch 'stable' into topic1
Conflicts:
a
$new_commit_hash
diff --cc a
index a67d715,96d4816..01a17ba
--- a/a
+++ b/a
@@@ -1,1 -1,1 +1,1 @@@
- merge in stable with conflict on topic1
-merge in stable with conflict 2
++merge in stable with conflict 2 merged topic1
-----------------------------------------------------------------------
Summary of changes:
a | 2 +-
b | 2 +-
c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)