| commit | e8e9964de489412aae2c9b8420d2fab8b00e9d12 | |
| author | Thomas Ackermann <th.acker@arcor.de> | |
| Tue, 27 Aug 2013 18:03:09 +0000 (27 20:03 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Aug 2013 22:14:44 +0000 (27 15:14 -0700) | ||
| tree | 07bef4a754e37a08ed7c7da080bdf399a24346d1 | treesnapshot (tar.gz zip) |
| parent | df47da758e6c7e76f9011f53df1cfdaf3443de1c | commitdiff |
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>
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>
| Documentation/user-manual.txt | diffblobblamehistory |