Mercurial > hg > gitweb
view tests/test-diff-newlines @ 2614:8ba1c31f6864
backout: allow backout of merge changeset with --parent option.
--parent allows to choose which parent of merge to revert to.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 14 Jul 2006 23:19:15 -0700 |
parents | b914f0557832 |
children |
line wrap: on
line source
#!/bin/sh hg init python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a hg ci -Ama -d '1 0' echo clean diff >> a hg ci -mb -d '2 0' hg diff -r0 -r1