diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:33:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:33:47 -0700 |
| commit | dfb67594e964e63f20546361597c06432c73779d (patch) | |
| tree | 3ea858127e139ee620a010f4ba82aa95b9fca77c /builtin/merge-ours.c | |
| parent | 2cd8ebdd3d28359b7886d994e84a8725394935e7 (diff) | |
| parent | 22570b68e3cb9380403d903680be3b3112a26490 (diff) | |
| download | git-dfb67594e964e63f20546361597c06432c73779d.tar.gz | |
Merge branch 'rs/janitorial' into maint
Code clean-up.
* rs/janitorial:
dir: remove unused variable sb
clean: remove unused variable buf
use file_exists() to check if a file exists in the worktree
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions