diff options
| author | Félix Sipma <felix+debian@gueux.org> | 2016-12-07 17:45:56 +0100 |
|---|---|---|
| committer | Félix Sipma <felix+debian@gueux.org> | 2016-12-07 17:45:56 +0100 |
| commit | 9abbbce037355686054d98bf3c5f7ac644a12310 (patch) | |
| tree | e1b3b7e4d1fc1960d44aa2e249f7e50f6ebf541a | |
| parent | 36545134e33297044ccf1fb58ec1e0dd18f54b29 (diff) | |
restore merge=False in gbp.conf
| -rw-r--r-- | debian/gbp.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf index cec628c..eb504eb 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,5 @@ [DEFAULT] pristine-tar = True + +[import-orig] +merge = False |