diff options
Diffstat (limited to 'test/conflicts.test')
| -rw-r--r-- | test/conflicts.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/conflicts.test b/test/conflicts.test index 21c8499..a5eb819 100644 --- a/test/conflicts.test +++ b/test/conflicts.test @@ -20,17 +20,17 @@ anymore, then the patch is fixed. < e < f < g - + $ quilt new a.diff > Patch %{P}a.diff is now on top $ echo %{?} > 0 - + $ quilt add one.txt > File one.txt added to patch %{P}a.diff $ echo %{?} > 0 - + $ mv one.txt one.orig $ sed -e "s/4/4+/" -e 's/d/d+/' one.orig > one.txt $ quilt refresh |