| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Fri, 5 Apr 2013 21:15:16 +0000 (14:15 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Fri, 5 Apr 2013 21:15:16 +0000 (14:15 -0700) | |
| commit | d5fec92...7af5c42217f3d1c707191791230bdefc |
| tree | 772e897...2d4247cae1c934408e4af0e6862e8914 (tree) |
| parent | 7b72ec5...14656af2d48c7a2a0b7251c35903bbaf (diff) |
| parent | e290c4b...44f109aff26cc3db4ae0aec92f3cc126 (diff) |
| Documentation/merge-options.txt | diff1 | | diff2 | | blob | history |
| builtin/merge.c | diff1 | | diff2 | | blob | history |