| commit | 2eb8810530edbcc5c5d030c169dd039d03ce2354 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Jul 2009 02:46:52 +0000 (1 19:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Jul 2009 02:46:52 +0000 (1 19:46 -0700) | ||
| tree | a2daccec9b2677ae06182ef659af74916a772926 | treesnapshot (tar.gz zip) |
| parent | 4f5e9875c14cb02bd593913d747702e0a57bee99 | commitdiff |
| parent | 606475f3178784e5a6b3a01dce1a54314345cf43 | commitdiff |
Merge branch 'master' into next
* master:
Remove filename from conflict markers
request-pull: really really disable pager
log-tree: fix confusing comment
* master:
Remove filename from conflict markers
request-pull: really really disable pager
log-tree: fix confusing comment
| ll-merge.c | diff1 | diff2 | blobhistory |
| merge-recursive.c | diff1 | diff2 | blobhistory |