| author | Jonathan Nieder <jrnieder@gmail.com> |
|---|---|
| Sat, 23 Jan 2010 09:48:42 +0000 (03:48 -0600) | |
| committer | Thomas Rast <trast@student.ethz.ch> |
| Sun, 24 Jan 2010 12:57:42 +0000 (13:57 +0100) | |
| commit | ebef7e5...4913a1480310735af9541e26c0b381ba |
| tree | b4869b2...b025f7f839b0b89019bec6fc42c5ddf7 (tree) |
| parent | 2928031...f0282857360add2b49db5fc7148d4813 (diff) |
| Documentation/git-merge.txt | diff | blob | history |