diff options
| author | Matthias Brugger <mbrugger@suse.com> | 2016-12-20 11:49:38 +0100 |
|---|---|---|
| committer | Stephen Finucane <stephen@that.guru> | 2016-12-23 23:12:58 +0000 |
| commit | d2d5b4f1a6f6b251bd822c3e59cda1b7bec9104f (patch) | |
| tree | 7a1ec5355fe532c465ffef3a265d06f909843631 /docs/development | |
| parent | 6cf9468870936c7ee8229208e50ff16c85faab3f (diff) | |
| download | patchwork-d2d5b4f1a6f6b251bd822c3e59cda1b7bec9104f.tar patchwork-d2d5b4f1a6f6b251bd822c3e59cda1b7bec9104f.tar.gz | |
pwclient: support 3-way merge
Add support for the 3-way merge in git-am.
This can be done via
- the commandline
- the global option section
- the per-project section
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
Reviewed-by: Stephen Finucane <stephen@that.guru>
Diffstat (limited to 'docs/development')
0 files changed, 0 insertions, 0 deletions