| author | David Pursehouse <dpursehouse@collab.net> |
|---|---|
| Sat, 17 Mar 2018 03:31:42 +0000 (12:31 +0900) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 19 Mar 2018 16:47:56 +0000 (09:47 -0700) | |
| commit | bd9958c...5883e2199ceef21b34d9b26783d30cba |
| tree | 15d5a4d...0e291c72106c5d7888df8ce9b25be9d6 (tree) |
| parent | c25d98b...a730cbc63033ba3360df2519d43a40cd (diff) |
| Documentation/merge-strategies.txt | diff | blob | history |