diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-01-26 19:14:01 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-01-26 19:14:01 +0000 |
| commit | f71df46ad8f4ad77fed85d4667ce965b54208000 (patch) | |
| tree | a524dfcb7d81031150314413d820f7d1ab4e157e | |
| parent | d9a45032947beecd2eec7b591a17fadce2dd3d49 (diff) | |
| download | quilt-f71df46ad8f4ad77fed85d4667ce965b54208000.tar.gz | |
- Oops, that was too much.
| -rw-r--r-- | quilt/import.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/quilt/import.in b/quilt/import.in index c5b74ae..ace3467 100644 --- a/quilt/import.in +++ b/quilt/import.in @@ -60,8 +60,8 @@ merge_patches() if [ -z "$opt_desc" ] then - local diff=$(diff <(echo "$old_desc") \ - <(echo "$new_desc") \ + local diff=$(diff -u <(echo "$old_desc") \ + <(echo "$new_desc") \ | sed -e '1,2d') if [ -n "$diff" ] then |