chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
quilt fixup: Check that funny changes are represented properly
[dgit.git]
/
tests
/
tests
/
gbp-orig
diff --git
a/tests/tests/gbp-orig
b/tests/tests/gbp-orig
index beea12169d711f415aadc13598744998430ff2ad..9a4937cb1e6f0fc91a9fd6a17d8152d45a13c709 100755
(executable)
--- a/
tests/tests/gbp-orig
+++ b/
tests/tests/gbp-orig
@@
-38,7
+38,7
@@
git commit -m 'Import 1.0'
git tag upstream/1.0
git checkout quilt-tip
-t-git-pseudo-merge upstream
+t-git-pseudo-merge
-m 'gbp-orig pseudomerge'
upstream
v=1.0-1