projects / platform / upstream / rpm.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3ade5ac) | patch
Differentiate between filtered and otherwise resolved conflicts
authorPanu Matilainen <pmatilai@redhat.com>
Fri, 24 Aug 2012 04:51:55 +0000 (07:51 +0300)
committerPanu Matilainen <pmatilai@redhat.com>
Fri, 24 Aug 2012 04:51:55 +0000 (07:51 +0300)
commit12322bad67b809101017a3991e67d09a2af4803c
tree5f9e66b02227ca5b256b04816559861be4753601tree | snapshot
parent3ade5ac3acc38554d775c1dd9a79723c3dd9ea90commit | diff
Differentiate between filtered and otherwise resolved conflicts

- No functional changes here, just spelling out the different
  cases explicitly.
lib/transaction.c diff | blob | history
Domain: SCM / Build;