diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-12-05 12:03:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-05 12:03:57 -0800 |
| commit | c18b86734113ee2aeb0e140c922c8fbd4accc860 (patch) | |
| tree | dce9cf24a2f23b15570bccdfcd542cfc56248db9 /builtin/merge-tree.c | |
| parent | Merge branch 'mh/config-flip-xbit-back-after-checking' (diff) | |
| download | tgif-c18b86734113ee2aeb0e140c922c8fbd4accc860.tar.xz | |
First batch for 2.3 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions