t / t4013 / diff.show_sideon commit Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax (ff65e79)
   1$ git show side
   2commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
   3Author: A U Thor <author@example.com>
   4Date:   Mon Jun 26 00:03:00 2006 +0000
   5
   6    Side
   7
   8diff --git a/dir/sub b/dir/sub
   9index 35d242b..7289e35 100644
  10--- a/dir/sub
  11+++ b/dir/sub
  12@@ -1,2 +1,4 @@
  13 A
  14 B
  15+1
  16+2
  17diff --git a/file0 b/file0
  18index 01e79c3..f4615da 100644
  19--- a/file0
  20+++ b/file0
  21@@ -1,3 +1,6 @@
  22 1
  23 2
  24 3
  25+A
  26+B
  27+C
  28diff --git a/file3 b/file3
  29new file mode 100644
  30index 0000000..7289e35
  31--- /dev/null
  32+++ b/file3
  33@@ -0,0 +1,4 @@
  34+A
  35+B
  36+1
  37+2
  38$