diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-05 14:24:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-05 14:24:59 -0700 |
| commit | b5699d17c3e04a022227fd95106e89f281417dcd (patch) | |
| tree | 0e771a84698287b0bd16b5e251ee7dfe42eaa939 /Documentation/git-merge.txt | |
| parent | Merge git://github.com/git-l10n/git-po into maint (diff) | |
| parent | Merge branch 'maint-1.8.2' into maint-1.8.3 (diff) | |
| download | tgif-b5699d17c3e04a022227fd95106e89f281417dcd.tar.xz | |
Merge branch 'maint-1.8.3' into maint
* maint-1.8.3:
Documentation/git-merge.txt: fix formatting of example block
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 8c7f2f66d8..a74c3713c6 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -186,11 +186,11 @@ In such a case, you can "unwrap" the tag yourself before feeding it to `git merge`, or pass `--ff-only` when you do not have any work on your own. e.g. ---- +---- git fetch origin git merge v1.2.3^0 git merge --ff-only v1.2.3 ---- +---- HOW CONFLICTS ARE PRESENTED |