chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6c76a03) | patch
Nicer conflict markers
authorKarl Hasselström <kha@treskal.com>
Wed, 19 Dec 2007 18:00:12 +0000 (18:00 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 19 Dec 2007 23:13:30 +0000 (23:13 +0000)
commit78d1c847f77f3ed482574d75b682f1408cdf2002
treea1d2a434225ea5f7e947d19026fe37dd674ef61atree | snapshot
parent6c76a03347dca249ac12f791d6321ff15889c64acommit | diff
Nicer conflict markers

Instead of tagging the conflict markers with sha1 hashes, use
"ancestor", "current", and "patched".

Signed-off-by: Karl Hasselström <kha@treskal.com>
stgit/git.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)