summaryrefslogtreecommitdiff
path: root/docs/merge-df_conflicts.txt
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-04-30 04:13:39 -0700
committerRussell Belfer <rb@github.com>2013-04-30 04:27:46 -0700
commit5fa7e469848bef4eab19cc069df9aa3b0134c9f7 (patch)
treed32c330bd2b6e74bc22d9dc9b519c10cb7d0066e /docs/merge-df_conflicts.txt
parent61c00541ac3c92eb3a82c4a1f67e47510ca1318b (diff)
downloadlibgit2-5fa7e469848bef4eab19cc069df9aa3b0134c9f7.tar.gz
Fix some formatting inconsistency
Diffstat (limited to 'docs/merge-df_conflicts.txt')
0 files changed, 0 insertions, 0 deletions