summaryrefslogtreecommitdiff
path: root/docs/merge-df_conflicts.txt
diff options
context:
space:
mode:
authorVicent Martí <vicent@github.com>2013-04-30 10:29:46 -0700
committerVicent Martí <vicent@github.com>2013-04-30 10:29:46 -0700
commit5e2261aca86310aa180eab5ccdc345b1539b024d (patch)
treed32c330bd2b6e74bc22d9dc9b519c10cb7d0066e /docs/merge-df_conflicts.txt
parent7dcda3aa3780292e33bb9229ff998ffe4edc07bf (diff)
parent5fa7e469848bef4eab19cc069df9aa3b0134c9f7 (diff)
downloadlibgit2-5e2261aca86310aa180eab5ccdc345b1539b024d.tar.gz
Merge pull request #1507 from arrbee/fix-look-inside-untracked-directory
Update diff handling of "untracked" directories
Diffstat (limited to 'docs/merge-df_conflicts.txt')
0 files changed, 0 insertions, 0 deletions