Skip to content

Latest commit

 

History

History
36 lines (27 loc) · 799 Bytes

SCREENSHOTS.md

File metadata and controls

36 lines (27 loc) · 799 Bytes

Screenshot updating instructions

Screenshots are done using:

screenshot-git-merge.png

  1. Scale your terminal window to 65x17
  2. Copy the below example to the clipboard
  3. pbpaste | cargo run
  4. Screenshot the window and store it as screenshot-git-merge.png
diff --cc hello.rb
index 0399cd5,59727f0..0000000
--- a/hello.rb
+++ b/hello.rb
@@@ -1,7 -1,7 +1,7 @@@
  #! /usr/bin/env ruby

  def hello
-   puts 'hola world'
 -  puts 'hello mundo'
++  puts 'hola mundo'
  end

  hello()

screenshot-diff2-conflict.png

  1. Scale your window to 72x10
  2. cargo run < testdata/conflict-markers.txt.riff-output
  3. Screenshot the window and store it as screenshot-diff2-conflict.png