Documentation: merge: move merge strategy list to end
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 23 Jan 2010 09:33:37 +0000 (03:33 -0600)
committerThomas Rast <trast@student.ethz.ch>
Sun, 24 Jan 2010 12:57:42 +0000 (13:57 +0100)
commita4081ba...fc78c1e1843590ed8d87544f3873dd10
tree5c21074...4db0d660b6d03859d92ce87f5b03259ecopy hash to clipboard (tree)
parented4a6ba...d0c8d446758eed8827e0d9190e624172copy hash to clipboard (diff)
Documentation/git-merge.txt