aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2016-01-18 18:21:29 +0700
committerJunio C Hamano <gitster@pobox.com>2016-01-19 11:22:29 -0800
commitd4cddd66d7ab620fe449ab01382b27178c908c10 (patch)
tree744710116ca7e389addbb46dd7acab26437d955f /builtin/merge-ours.c
parenta46dcfb8403191ce042ad123a3314a174fa9ca4c (diff)
downloadgit-d4cddd66d7ab620fe449ab01382b27178c908c10.tar.gz
git-d4cddd66d7ab620fe449ab01382b27178c908c10.tar.xz
worktree.c: fix indentation
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions