| author | Jonathan Nieder <jrnieder@gmail.com> |
|---|---|
| Sat, 23 Jan 2010 09:26:57 +0000 (03:26 -0600) | |
| committer | Thomas Rast <trast@student.ethz.ch> |
| Sun, 24 Jan 2010 12:57:42 +0000 (13:57 +0100) | |
| commit | 35e9d63...3c15faf01fc9551d5ed648564dcd4014 |
| tree | 254787d...5772682e471ce1a72258c9db8110b7ac (tree) |
| parent | 2d0f686...44bfb7055b317d178b703078b76dcc4f (diff) |
| Documentation/git-merge.txt | diff | blob | history |