| author | brian m. carlson <sandals@crustytoothpaste.net> |
|---|---|
| Sun, 8 Dec 2013 20:40:27 +0000 (20:40 +0000) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 9 Dec 2013 21:42:40 +0000 (13:42 -0800) | |
| commit | c566500...327388832fa8be0b3bf17669f672481b |
| tree | 74d9679...67a1fa97228c822be2bb5a82f099368d (tree) |
| parent | 2f93541...88fadd1ff5307d81c2c8921ee3eea058 (diff) |
| Documentation/merge-strategies.txt | diff | blob | history |