diff options
| author | Thomas Ackermann <th.acker@arcor.de> | 2013-08-27 20:03:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-27 15:14:44 -0700 |
| commit | e8e9964de489412aae2c9b8420d2fab8b00e9d12 (patch) | |
| tree | 07bef4a754e37a08ed7c7da080bdf399a24346d1 /diff-no-index.c | |
| parent | Improve section "Manipulating branches" (diff) | |
| download | git-e8e9964de489412aae2c9b8420d2fab8b00e9d12.tar.gz git-e8e9964de489412aae2c9b8420d2fab8b00e9d12.zip | |
Improve section "Merging multiple trees"
Remove unnecessary quoting.
Simplify description of three-way merge.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions