diff options
Diffstat (limited to 'doc/git-annex-merge.mdwn')
| -rw-r--r-- | doc/git-annex-merge.mdwn | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/git-annex-merge.mdwn b/doc/git-annex-merge.mdwn index 3001e9bed..bb204d725 100644 --- a/doc/git-annex-merge.mdwn +++ b/doc/git-annex-merge.mdwn @@ -12,6 +12,9 @@ This performs the same merging (and merge conflict resolution) that is done by the sync command, but without pushing or pulling any data. +When annex.resolvemerge is set to false, merge conflict resolution +will not be done. + # SEE ALSO [[git-annex]](1) |