Refactor to do diff per commit and only show conflicted changes in merges.
[git-central.git] / tests / t2202-4.txt
1 From: author@payflex.com
2 To: commits@list.com
3 Subject: [cbas] topic branch updated. $existing_commit_hash
4 X-Git-Refname: refs/heads/topic
5 X-Git-Reftype: branch
6 X-Git-Oldrev: $old_commit_hash
7 X-Git-Newrev: $existing_commit_hash
8
9 The branch, topic has been updated
10        via $existing_commit_abbrev update branch with existing commits does not replay them on topic
11       from $old_commit_abbrev create branch on topic 2
12
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.
16
17 - Log -----------------------------------------------------------------
18
19 Summary of changes:
20  a |    2 +-
21  1 files changed, 1 insertions(+), 1 deletions(-)