diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-10 09:39:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-10 09:39:08 -0700 |
| commit | 9ab5a338fc03d5ea5c3ad4cd56e04029cd863c83 (patch) | |
| tree | b9b4fc57306b099098838c4889e49540f03bf9ae /builtin/merge-ours.c | |
| parent | t/t4018: avoid two unnecessary sub-shell invocations (diff) | |
| parent | config.txt: fix placement of diff.noprefix (diff) | |
| download | tgif-9ab5a338fc03d5ea5c3ad4cd56e04029cd863c83.tar.xz | |
Merge branch 'maint'
* maint:
config.txt: fix placement of diff.noprefix
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions