![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Apr 2012 20:09:21 +0000 (13:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Apr 2012 20:11:49 +0000 (13:11 -0700) | ||
| commit | d82829b6128263951569221ca0c00dd143da055c | |
| tree | 3d24c2c1be3a76cc7574cd5f65732cd3ac9c3450 | tree | snapshot |
| parent | 02f419efcbda05f9923306ae1fcdd754187563fa | commit | diff |
| parent | cb2ed324fc917db0b79d7b1f3756575ffa5f70d5 | commit | diff |
Sync with 1.7.9.6
| builtin/merge.c | diff1 | | diff2 | | blob | history |