tests/t2204-1.txt

   1 From: author@example.com
   2 To: commits@list.com
   3 Subject: [cbas] topic1 branch updated. $new_commit_hash
   4 X-Git-Refname: refs/heads/topic1
   5 X-Git-Reftype: branch
   6 X-Git-Oldrev: $old_commit_hash
   7 X-Git-Newrev: $new_commit_hash
   8
   9 The branch, topic1 has been updated
  10        via $new_commit_abbrev resolved lines for merging stable into topic1
  11       from $old_commit_abbrev lines changed on topic1
  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 commit $new_commit_hash
  20 Merge: $old_commit_abbrev $stable_abbrev
  21 Author: A U Thor <author@example.com>
  22 Date:   $new_commit_date
  23
  24     resolved lines for merging stable into topic1
  25
  26 $new_commit_hash
  27 diff --cc a
  28 index d288e69,a9ccdfe..3f45f93
  29 --- a/a
  30 +++ b/a
  31 @@@ -1,3 -1,3 +1,3 @@@
  32 - line1.topic1
  33 - line2.topic1
  34 - line3.topic1
  35  -line1.stable
  36 ++line1.topic
  37 + line2.stable
  38  -line3.stable
  39 ++line3.resolved
  40
  41 -----------------------------------------------------------------------
  42
  43 Summary of changes:
  44  a |    6 +++---
  45  1 files changed, 3 insertions(+), 3 deletions(-)