]>
author | John Keeping <john@keeping.me.uk> | |
Fri, 5 Apr 2013 11:37:30 +0000 (12:37 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 5 Apr 2013 17:57:23 +0000 (10:57 -0700) | ||
commit | 4db4f0fba43d7e9b9b87a3a40d85ffbdfcef2884 | |
tree | 02b500e030471bbaddeebcee9d39ef0286f9ad51 | tree | snapshot |
parent | 07924d4d50e5304fb53eb60aaba8aef31d4c4e5e | commit | diff |
Documentation/merge-strategies.txt | diff | blob | history |