git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: df47da7)
Improve section "Merging multiple trees"
authorThomas Ackermann <redacted>
Tue, 27 Aug 2013 18:03:09 +0000 (20:03 +0200)
committerJunio C Hamano <redacted>
Tue, 27 Aug 2013 22:14:44 +0000 (15:14 -0700)
commite8e9964de489412aae2c9b8420d2fab8b00e9d12
tree07bef4a754e37a08ed7c7da080bdf399a24346d1tree | snapshot
parentdf47da758e6c7e76f9011f53df1cfdaf3443de1ccommit | diff
Improve section "Merging multiple trees"

Remove unnecessary quoting.
Simplify description of three-way merge.

Signed-off-by: Jonathan Nieder <redacted>
Signed-off-by: Thomas Ackermann <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/user-manual.txt diff | blob | history
git clone https://git.99rst.org/PROJECT