| author | Jonathan Nieder <jrnieder@gmail.com> |
|---|---|
| Sat, 23 Jan 2010 09:31:19 +0000 (03:31 -0600) | |
| committer | Thomas Rast <trast@student.ethz.ch> |
| Sun, 24 Jan 2010 12:57:42 +0000 (13:57 +0100) | |
| commit | ed4a6ba...d0c8d446758eed8827e0d9190e624172 |
| tree | 80ee7aa...f830759896cc99cb40b057a83cc5077b (tree) |
| parent | 35e9d63...3c15faf01fc9551d5ed648564dcd4014 (diff) |
| Documentation/git-merge.txt | diff | blob | history |