| author | Jonathan Nieder <jrnieder@gmail.com> |
|---|---|
| Sat, 23 Jan 2010 09:42:46 +0000 (03:42 -0600) | |
| committer | Thomas Rast <trast@student.ethz.ch> |
| Sun, 24 Jan 2010 12:57:42 +0000 (13:57 +0100) | |
| commit | b40bb37...a618534b930ce4da5ffffb215b5cb488 |
| tree | 30959fd...1e176374bf7d24aee9c3f273e14334df (tree) |
| parent | a4081ba...fc78c1e1843590ed8d87544f3873dd10 (diff) |
| Documentation/git-merge.txt | diff | blob | history |