diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-02-10 13:46:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-10 13:46:15 -0800 |
| commit | d1672d90bae20d33512fbf8f9b8330e5840da0c5 (patch) | |
| tree | 66db4fbb14b3dde2beb64d5498bbee5fc4a47e3d /xdiff/xmerge.c | |
| parent | Documentation: quote braces in {upstream} notation (diff) | |
| parent | Git 1.6.6.2 (diff) | |
| download | tgif-d1672d90bae20d33512fbf8f9b8330e5840da0c5.tar.xz | |
Sync with 1.6.6.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions