| author | Jonathan Nieder <jrnieder@gmail.com> |
|---|---|
| Sat, 23 Jan 2010 22:48:40 +0000 (16:48 -0600) | |
| committer | Thomas Rast <trast@student.ethz.ch> |
| Sun, 24 Jan 2010 12:57:59 +0000 (13:57 +0100) | |
| commit | 3588cf9...812d47dd34b82039c7776f5225a947fb |
| tree | b5747d6...87b5b714410b1f82e64e8194a53d059e (tree) |
| parent | ebef7e5...4913a1480310735af9541e26c0b381ba (diff) |
| Documentation/git-merge.txt | diff | blob | history |