diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-10-31 03:25:33 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-10-31 11:12:26 -0700 |
| commit | 501a75a7b308ed9631cd4802d891e6b56c06821a (patch) | |
| tree | 4a31a6825838654afca7a3e42ab828a97a4f7de5 /builtin/diff.c | |
| parent | merge: simplify ff-only option (diff) | |
| download | tgif-501a75a7b308ed9631cd4802d891e6b56c06821a.tar.xz | |
t: replace pulls with merges
This is what the code intended.
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions