diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2015-08-07 16:56:47 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2015-08-07 16:56:47 +0200 |
| commit | 6d9dee06bcb9d9450319c722c26c3fd0d7230ac9 (patch) | |
| tree | c1cc870ed7a66a8899677947edf145152c96bd0a | |
| parent | 8394d46e0cbb731154557a64456c7050f733ce8f (diff) | |
magit.org: mention merge.conflictstyle=diff3
| -rw-r--r-- | Documentation/magit.org | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/magit.org b/Documentation/magit.org index 5b8de14..a3d6401 100644 --- a/Documentation/magit.org +++ b/Documentation/magit.org @@ -1793,6 +1793,10 @@ displayed but not how. Resolve outstanding conflicts in a file using Ediff, defaulting to the file at point. + Provided that the value of ~merge.conflictstyle~ is ~diff3~, you can + view the file's merge-base revision using ~/~ in the Ediff control + buffer. + In the rare event that you want to manually resolve all conflicts, including those already resolved by Git, use ~ediff-merge-revisions-with-ancestor~. |