gistfile1.sh

$ git clone https://github.com/keithclark/selectivizr.git
Cloning into selectivizr...
remote: Counting objects: 131, done.
remote: Compressing objects: 100% (112/112), done.
remote: Total 131 (delta 48), reused 0 (delta 0)
Receiving objects: 100% (131/131), 28.41 KiB, done.
Resolving deltas: 100% (48/48), done.
$ cd selectivizr/
$ git config --global core.autocrlf true
$ git rm --cached -r .
rm 'README.markdown'
rm 'changelog.txt'
rm 'selectivizr.js'
rm 'tests/master/css/common.css'
rm 'tests/master/css/iframe.css'
rm 'tests/master/css/import-print.css'
rm 'tests/master/css/import-quoted-double.css'
rm 'tests/master/css/import-quoted-single.css'
rm 'tests/master/css/import-screen.css'
rm 'tests/master/css/import-url-fully-qualified-path.css'
rm 'tests/master/css/import-url-quoted-double.css'
rm 'tests/master/css/import-url-quoted-single.css'
rm 'tests/master/css/import-url-root-relative-path.css'
rm 'tests/master/css/import-url-unquoted.css'
rm 'tests/master/css/master.css'
rm 'tests/master/css/nested/import-url-relative-path.css'
rm 'tests/master/css/nested/test.png'
rm 'tests/master/html/domready-postload.html'
rm 'tests/master/html/iframe-hash.html'
rm 'tests/master/html/iframe-query.html'
rm 'tests/master/html/iframe.html'
rm 'tests/master/index.html'
rm 'tests/master/js/test.js'
$ git diff --cached --name-only -z | xargs -0 git add
$ git commit -m "Fix CRLF"
[master 116a6ac] Fix CRLF
 5 files changed, 1100 insertions(+), 1100 deletions(-)
$ git ls-files -z | xargs -0 rm
$ git checkout .
$ git remote add victor https://github.com/victor-homyakov/selectivizr.git
$ git fetch victor
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 2), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From https://github.com/victor-homyakov/selectivizr
 * [new branch]      master     -> victor/master
$ git merge victor/master
Auto-merging selectivizr.js
CONFLICT (content): Merge conflict in selectivizr.js
Recorded preimage for 'selectivizr.js'
Automatic merge failed; fix conflicts and then commit the result.
$ git mergetool
Merging:
selectivizr.js

Normal merge conflict for 'selectivizr.js':
  {local}: modified
  {remote}: modified
Hit return to start merge resolution tool (opendiff): 
$ git st
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
# Changes to be committed:
#
#	modified:   selectivizr.js
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	selectivizr.js.orig
$ git commit
Recorded resolution for 'selectivizr.js'.
[master 2afc236] Merge remote-tracking branch 'victor/master'
$