| author | Jonathan Nieder <jrnieder@gmail.com> |
|---|---|
| Sat, 23 Jan 2010 09:44:17 +0000 (03:44 -0600) | |
| committer | Thomas Rast <trast@student.ethz.ch> |
| Sun, 24 Jan 2010 12:57:42 +0000 (13:57 +0100) | |
| commit | 30f2bad...84a3f6961b38579c1c23c64b72f64f24 |
| tree | b666541...930f5548a81c5c511b5ca92308c508fc (tree) |
| parent | b40bb37...a618534b930ce4da5ffffb215b5cb488 (diff) |
| Documentation/git-merge.txt | diff | blob | history |